Skip to content

Commit

Permalink
[build] Remove "filesystem" from the Boost dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cbentejac committed Jan 9, 2024
1 parent 5bf9f67 commit 32fbd24
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
8 changes: 1 addition & 7 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/cmake/AliceVisionConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 32fbd24

Please sign in to comment.