diff options
| author | Naios <naios-dev@live.de> | 2016-03-14 15:27:33 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-19 23:19:50 +0100 |
| commit | b0ac332d58cc7d7e2da4ba26efc2f3416c674784 (patch) | |
| tree | adf5cf58803efeb51650c2da754278c2cc2f6c27 /cmake/platform | |
| parent | fee9bb904a5dcfc93e6ea85789b5aacc203a440a (diff) | |
CMake: Provide proper interface targets from dependencies
* to make use of cmakes inherited link dependencies which
imports all include directories/ definitions from the link library
(cherry picked from commit 1a572d242593124f986d3ed08710b96a142a6763)
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 9 | ||||
| -rw-r--r-- | cmake/platform/win/settings.cmake | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 754ff450fcc..2f9c71f28ed 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) 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 ) |