diff options
| author | bloerwald <bloerwald@googlemail.com> | 2014-10-28 18:33:19 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-28 18:33:19 +0000 |
| commit | ff0f84e3aa23a32106e88e84c7abe10229200e9e (patch) | |
| tree | 7aafb946356dc4f82031badbcbbfbe53eac3e5d0 /cmake/macros/ConfigureBoost.cmake | |
| parent | 6b6b6e8f09732ef0306b2cf3c6d5f8953a4fddca (diff) | |
Tools/connection_patcher: remove c# code, add c++ code with minor modification, move to tools, integrate into cmake
note: no longer downloads nonexistent modules
note: now throws on not finding patterns
new dependency: boost.filesystem
Closes #13471
Diffstat (limited to 'cmake/macros/ConfigureBoost.cmake')
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index 3d3791b8a93..81b4dd9abb2 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -25,11 +25,15 @@ if(WIN32) add_definitions(-D_WIN32_WINNT=${ver})
endif()
-find_package(Boost 1.49 REQUIRED system thread program_options)
+find_package(Boost 1.49 REQUIRED system filesystem thread program_options)
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
add_definitions(-DBOOST_REGEX_NO_LIB)
add_definitions(-DBOOST_CHRONO_NO_LIB)
+if(!WIN32) # https://svn.boost.org/trac/boost/ticket/6779
+ add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)
+endif()
+
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
endif()
|