Clean CMake boost export.

DGtal-team · Mar 6, 2025 · 89d6621 · 89d6621
1 parent 83d2d16
commit 89d6621
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 122 deletions.
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -8,47 +8,6 @@ install(TARGETS
     DGtal 
       # Dependancies also built by the project
       DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
-      # Other dependencies
-      boost_headers
-      boost_throw_exception
-      boost_assert
-      boost_config
-      boost_iostreams
-      boost_core
-      boost_detail
-      boost_function
-      boost_static_assert
-      boost_integer
-      boost_iterator
-      boost_mpl
-      boost_preprocessor
-      boost_random
-      boost_range
-      boost_regex
-      boost_smart_ptr
-      boost_utility
-      boost_numeric_conversion
-      boost_type_traits
-      boost_bind
-      boost_concept_check
-      boost_function_types
-      boost_fusion
-      boost_optional
-      boost_predef
-      boost_array
-      boost_dynamic_bitset
-      boost_io
-      boost_system
-      boost_container_hash
-      boost_conversion
-      boost_tuple
-      boost_typeof
-      boost_move
-      boost_functional
-      boost_mp11
-      boost_variant2
-      boost_winapi
-      boost_describe
   EXPORT DGtalTargets
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -62,47 +21,6 @@ export(TARGETS
     DGtal 
       # Dependancies also built by the project
       DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
-      # Other dependencies
-      boost_headers
-      boost_throw_exception
-      boost_assert
-      boost_config
-      boost_iostreams
-      boost_core
-      boost_detail
-      boost_function
-      boost_static_assert
-      boost_integer
-      boost_iterator
-      boost_mpl
-      boost_preprocessor
-      boost_random
-      boost_range
-      boost_regex
-      boost_smart_ptr
-      boost_utility
-      boost_numeric_conversion
-      boost_type_traits
-      boost_bind
-      boost_concept_check
-      boost_function_types
-      boost_fusion
-      boost_optional
-      boost_predef
-      boost_array
-      boost_dynamic_bitset
-      boost_io
-      boost_system
-      boost_container_hash
-      boost_conversion
-      boost_tuple
-      boost_typeof
-      boost_move
-      boost_functional
-      boost_mp11
-      boost_variant2
-      boost_winapi
-      boost_describe
   NAMESPACE DGtal::
   FILE DGtalTargets.cmake
 )

diff --git a/cmake/deps/boost.cmake b/cmake/deps/boost.cmake
@@ -142,3 +142,15 @@ if(NOT TARGET Boost::boost)
         add_library(Boost::boost ALIAS Boost::headers)
     endif()
 endif()
+
+# Install boost files when installing library
+install(DIRECTORY ${BOOST_INCLUDE_DIRS}/Boost DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DGtal/3rdParties/)
+install(TARGETS boost_headers EXPORT boost_headers)
+install(EXPORT boost_headers DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost NAMESPACE Boost::)
+
+# Export target Boost::headers
+export(TARGETS
+    boost_headers
+    NAMESPACE Boost::
+    FILE BoostTargets.cmake
+)
diff --git a/src/BoostAddons/CMakeLists.txt b/src/BoostAddons/CMakeLists.txt
@@ -2,44 +2,5 @@ set(BOOSTADDONS_SRC
 		zlib.cpp)
 
 add_library(DGTAL_BoostAddons STATIC ${BOOSTADDONS_SRC})
-target_link_libraries(DGTAL_BoostAddons PRIVATE Boost::boost       boost_headers
-      boost_throw_exception
-      boost_assert
-      boost_config
-      boost_iostreams
-      boost_core
-      boost_detail
-      boost_function
-      boost_static_assert
-      boost_integer
-      boost_iterator
-      boost_mpl
-      boost_preprocessor
-      boost_random
-      boost_range
-      boost_regex
-      boost_smart_ptr
-      boost_utility
-      boost_numeric_conversion
-      boost_type_traits
-      boost_bind
-      boost_concept_check
-      boost_function_types
-      boost_fusion
-      boost_optional
-      boost_predef
-      boost_array
-      boost_dynamic_bitset
-      boost_io
-      boost_system
-      boost_container_hash
-      boost_conversion
-      boost_tuple
-      boost_typeof
-      boost_move
-      boost_functional
-      boost_mp11
-      boost_variant2
-      boost_winapi
-      boost_describe)
+target_link_libraries(DGTAL_BoostAddons PRIVATE Boost::boost)
 set_property(TARGET DGTAL_BoostAddons PROPERTY POSITION_INDEPENDENT_CODE ON)