aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-11-12 16:59:07 +0100
committerShauren <shauren.trinity@gmail.com>2015-11-12 16:59:07 +0100
commitb5fbf773a5071fc4c88f8e0112ffe8a9f2f760e3 (patch)
tree81ba302acf1197bd99ec30c49e102aef1847ec3c
parente8108b518b0f25bd6ae4e527aa25adde0ea6f9d4 (diff)
Buildsystem: Fixed building on windows 10 with cmake 3.4
-rw-r--r--cmake/macros/ConfigureBoost.cmake13
1 files changed, 1 insertions, 12 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake
index 022d84246ef..b3a71b8a682 100644
--- a/cmake/macros/ConfigureBoost.cmake
+++ b/cmake/macros/ConfigureBoost.cmake
@@ -1,13 +1,3 @@
-macro(get_WIN32_WINNT version)
- if (WIN32 AND CMAKE_SYSTEM_VERSION)
- set(ver ${CMAKE_SYSTEM_VERSION})
- string(REPLACE "." "" ver ${ver})
- string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
-
- set(${version} "0x${ver}")
- endif()
-endmacro()
-
if(WIN32)
set(BOOST_DEBUG ON)
if(DEFINED ENV{BOOST_ROOT})
@@ -25,8 +15,7 @@ if(WIN32)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
- get_WIN32_WINNT(ver)
- add_definitions(-D_WIN32_WINNT=${ver})
+ add_definitions(-D_WIN32_WINNT=0x0601)
endif()
find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams regex)