diff options
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 11 | ||||
| -rw-r--r-- | cmake/platform/win/settings.cmake | 8 |
2 files changed, 5 insertions, 14 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 754ff450fcc..79b426d7e03 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -1,12 +1,3 @@ -# Package overloads - Linux -if(CMAKE_SYSTEM_NAME MATCHES "Linux") - if (NOT NOJEM) - set(JEMALLOC_LIBRARY "jemalloc") - add_definitions(-DNO_BUFFERPOOL) - message(STATUS "UNIX: Using jemalloc") - endif() -endif() - # set default configuration directory if( NOT CONF_DIR ) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) @@ -38,7 +29,7 @@ if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) -elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") +elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang") include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) else() add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index c68d7bc51cc..da66daf0832 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -1,7 +1,3 @@ -# Package overloads -set(BZIP2_LIBRARIES "bzip2") -set(ZLIB_LIBRARIES "zlib") - # check the CMake preload parameters (commented out by default) # overload CMAKE_INSTALL_PREFIX if not being set properly @@ -13,6 +9,10 @@ set(ZLIB_LIBRARIES "zlib") # endif() #endif() +if (WIN32) + add_definitions(-D_WIN32_WINNT=0x0601) +endif() + if ( MSVC ) include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake) elseif ( MINGW ) |