diff options
| author | bloerwald <bloerwald@googlemail.com> | 2014-10-30 00:17:18 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-30 00:17:41 +0000 |
| commit | 428d510f76640486007c53e9d243d4b7fac0ac69 (patch) | |
| tree | 07602f2dc5a5b7b30e059e91470cfd468ea0815c /cmake/macros/ConfigureBoost.cmake | |
| parent | 848c10e581a45e962045827092e1bd68ef2c52f0 (diff) | |
Build: Support boost versions compiled in C++11 as well as C++03 mode
Issues related to boost::filesystem and scoped enums
Diffstat (limited to 'cmake/macros/ConfigureBoost.cmake')
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index 81b4dd9abb2..6b2419a00e7 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -30,7 +30,15 @@ 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
+try_compile (boost_filesystem_copy_links_without_NO_SCOPED_ENUM
+ ${CMAKE_BINARY_DIR}/try_compile/boost_filesystem_copy_links_without_NO_SCOPED_ENUM
+ SOURCES ${CMAKE_SOURCE_DIR}/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp
+ COMPILE_DEFINITIONS -I${Boost_INCLUDE_DIR}
+ --std=c++11
+ LINK_LIBRARIES ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
+)
+
+if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)
endif()
|