Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions include/BoostInstall.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,20 @@ function(boost_install_target)
string(APPEND CONFIG_INSTALL_DIR "-static")
endif()

# C++20 modules supported since CMake 3.28
set(__BOOST_INSTALL_FILE_SET_ARGS)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
set(__BOOST_INSTALL_FILE_SET_ARGS FILE_SET CXX_MODULES DESTINATION "${CMAKE_INSTALL_DATADIR}")
endif()

install(TARGETS ${LIB} EXPORT ${LIB}-targets
# explicit destination specification required for 3.13, 3.14 no longer needs it
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${__BOOST_INSTALL_FILE_SET_ARGS}
)

export(TARGETS ${LIB} NAMESPACE Boost:: FILE export/${LIB}-targets.cmake)
Expand Down
3 changes: 3 additions & 0 deletions include/BoostRoot.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ macro(__boost_add_header_only lib)

endmacro()

# C++20 modules
option(BOOST_USE_MODULES "Build Boost as a collection of C++20 modules (unstable)" OFF)

#

file(GLOB __boost_libraries RELATIVE "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs" "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/*/CMakeLists.txt" "${BOOST_SUPERPROJECT_SOURCE_DIR}/libs/numeric/*/CMakeLists.txt")
Expand Down
Loading