diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8fcdd67318..b5478f6ad2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -274,7 +274,7 @@ endif() # Boost # ============================================================================== option(BOOST_NO_CXX11 "if Boost is compiled without C++11 support (as it is often the case in OS packages) this must be enabled to avoid symbol conflicts (SCOPED_ENUM)." OFF) -set(ALICEVISION_BOOST_COMPONENTS atomic container date_time filesystem graph json log log_setup program_options regex serialization system thread timer) +set(ALICEVISION_BOOST_COMPONENTS atomic container date_time graph json log log_setup program_options regex serialization system thread timer) if(ALICEVISION_BUILD_TESTS) set(ALICEVISION_BOOST_COMPONENT_UNITTEST unit_test_framework) endif() @@ -306,12 +306,6 @@ else() set(Boost_USE_STATIC_LIBS ON) endif() -if(BOOST_NO_CXX11) - # Avoid link errors on boost filesystem copy_file function - # http://stackoverflow.com/questions/35007134/c-boost-undefined-reference-to-boostfilesystemdetailcopy-file - add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) -endif() - # ============================================================================== # OpenEXR >= 2.5 diff --git a/src/cmake/AliceVisionConfig.cmake.in b/src/cmake/AliceVisionConfig.cmake.in index 5106ab2bb6..8dc4a0d12d 100644 --- a/src/cmake/AliceVisionConfig.cmake.in +++ b/src/cmake/AliceVisionConfig.cmake.in @@ -98,10 +98,6 @@ if(ALICEVISION_HAVE_OPENMP) endif() find_dependency(Boost COMPONENTS @ALICEVISION_BOOST_COMPONENTS@) -set(BOOST_NO_CXX11 @BOOST_NO_CXX11@) -if(BOOST_NO_CXX11) - add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) -endif() set(ALICEVISION_BUILD_SFM @ALICEVISION_BUILD_SFM@) if(ALICEVISION_BUILD_SFM)