Skip to content

Feat: Add support to install FILE_SET too #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ClausKlein wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feat: Add support to install FILE_SET too #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cab5c23
Feat: Add support to install FILE_SET too
ClausKlein Aug 24, 2026
a39c41b
Install CXX_MODULES to versioned data dir
ClausKlein Aug 24, 2026
f025fb9
Cleanup comments
ClausKlein Aug 25, 2026
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
43 changes: 39 additions & 4 deletions include/BoostInstall.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt

if(NOT CMAKE_VERSION VERSION_LESS 3.10)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.10)
include_guard()
endif()

Expand Down Expand Up @@ -337,23 +337,53 @@ function(boost_install_target)
string(APPEND CONFIG_INSTALL_DIR "-static")
endif()

set(__INSTALL_CXX_MODULES)
set(__EXPORT_CXX_MODULES_CONFIG_FILES)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
get_target_property(INTERFACE_CXX_MODULE_SETS ${LIB} INTERFACE_CXX_MODULE_SETS)
if(INTERFACE_CXX_MODULE_SETS)
boost_message(DEBUG "boost_install_target: '${__TARGET}' has INTERFACE_CXX_MODULE_SETS=${INTERFACE_CXX_MODULE_SETS}")
set(extrainstalldir "${CMAKE_INSTALL_DATADIR}/boost-${__VERSION}/${LIB}")
set(__INSTALL_CXX_MODULES FILE_SET ${INTERFACE_CXX_MODULE_SETS} DESTINATION ${extrainstalldir})
set(__EXPORT_CXX_MODULES_CONFIG_FILES CXX_MODULES_DIRECTORY .)
endif()
endif()

set(__INSTALL_HEADER_SETS)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.23)
get_target_property(INTERFACE_HEADER_SETS ${LIB} INTERFACE_HEADER_SETS)
if(INTERFACE_HEADER_SETS)
boost_message(DEBUG "boost_install_target: '${__TARGET}' has INTERFACE_HEADER_SETS=${INTERFACE_HEADER_SETS}")
set(__INSTALL_HEADER_SETS FILE_SET ${INTERFACE_HEADER_SETS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/boost-${__VERSION}")
endif()
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}"
# NOTE: explicit needed if used starting with cmake v3.28!
# optional install: FILE_SET CXX_MODULES DESTINATION "${CMAKE_INSTALL_DATADIR}"
${__INSTALL_CXX_MODULES}
# NOTE: explicit needed if used starting with cmake v3.23!
# Any module files from C++ modules from PUBLIC sources in a file set
# of type CXX_MODULES will be installed to the given DESTINATION.
# optional install: FILE_SET HEADERS
${__INSTALL_HEADER_SETS}
)

# TODO(CK): what is this for?
export(TARGETS ${LIB} NAMESPACE Boost:: FILE export/${LIB}-targets.cmake)

if(MSVC)
if(TYPE STREQUAL "SHARED_LIBRARY")
install(FILES $<TARGET_PDB_FILE:${LIB}> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
endif()

if(TYPE STREQUAL "STATIC_LIBRARY" AND NOT CMAKE_VERSION VERSION_LESS 3.15)
if(TYPE STREQUAL "STATIC_LIBRARY" AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
install(FILES "$<TARGET_FILE_DIR:${LIB}>/$<TARGET_FILE_PREFIX:${LIB}>$<TARGET_FILE_BASE_NAME:${LIB}>.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
endif()
endif()
Expand All @@ -362,7 +392,11 @@ function(boost_install_target)
__boost_install_update_sources(${LIB} ${__EXTRA_DIRECTORY} ${__EXTRA_INSTALL_DIRECTORY})
endif()

install(EXPORT ${LIB}-targets DESTINATION "${CONFIG_INSTALL_DIR}" NAMESPACE Boost:: FILE ${LIB}-targets.cmake)
install(EXPORT ${LIB}-targets DESTINATION "${CONFIG_INSTALL_DIR}" NAMESPACE Boost:: FILE ${LIB}-targets.cmake
# NOTE: explicit needed if used starting with cmake v3.28!
# optional install config packages for: FILE_SET CXX_MODULES
${__EXPORT_CXX_MODULES_CONFIG_FILES}
)

set_target_properties(${LIB} PROPERTIES _boost_is_installed ON)

Expand Down Expand Up @@ -491,7 +525,7 @@ function(boost_install_target)

# Header-only libraries are architecture-independent

if(NOT CMAKE_VERSION VERSION_LESS 3.14)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)

write_basic_package_version_file("${CONFIG_VERSION_FILE_NAME}" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)

Expand Down Expand Up @@ -589,6 +623,7 @@ function(boost_install)

endif()

set(extrainstalldir)
if(__EXTRA_DIRECTORY AND NOT BOOST_SKIP_INSTALL_RULES AND NOT CMAKE_SKIP_INSTALL_RULES)

# Extract the library name from the path, one component up from the extra directory
Expand Down
3 changes: 3 additions & 0 deletions include/BoostRoot.cmake
View file
Open in desktop
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