diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-11-12 16:59:07 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-11-12 17:55:04 +0100 |
| commit | 11b3a60900b81bb5edc5a0f2f9b25a96eee3b085 (patch) | |
| tree | 1012a9c19ac401837d4b2150ab10e91c487748b3 | |
| parent | 302623a1516e487ad64f2028aec287b99372e33a (diff) | |
Buildsystem: Fixed building on windows 10 with cmake 3.4
(cherry picked from commit b5fbf773a5071fc4c88f8e0112ffe8a9f2f760e3)
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 13 |
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) |