Skip to content

Commit 1e82e7e

Browse files
committed
Append BOOST_INSTALL_INCLUDE_SUBDIR onto CMAKE_INSTALL_DATADIR
1 parent 91953bc commit 1e82e7e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ or `cmake-gui`:
125125
Directory in which to install the compiled libraries. Can be relative to
126126
`CMAKE_INSTALL_PREFIX`. Default `lib`.
127127

128+
* [`CMAKE_INSTALL_DATADIR`](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html)
129+
130+
Directory in which to install the data files (e.g. debugger visualizers).
131+
Can be relative to `CMAKE_INSTALL_PREFIX`. Default `share`.
132+
128133
* `BOOST_INSTALL_CMAKEDIR`
129134

130135
Directory in which to install the CMake configuration files. Default `lib/cmake`.
@@ -150,9 +155,10 @@ or `cmake-gui`:
150155
* `BOOST_INSTALL_INCLUDE_SUBDIR`
151156

152157
When `BOOST_INSTALL_LAYOUT` is `versioned`, headers are installed in a
153-
subdirectory of `CMAKE_INSTALL_INCLUDEDIR` (to enable several Boost releases
154-
being installed at the same time.) The default for release e.g. 1.81 is
155-
`/boost-1_81`.)
158+
subdirectory of `CMAKE_INSTALL_INCLUDEDIR` and data files are installed
159+
in a subdirectory of `CMAKE_INSTALL_DATADIR` (to enable several Boost
160+
releases being installed at the same time.) The default for release e.g.
161+
1.81 is `/boost-1_81`.)
156162

157163
* `BOOST_RUNTIME_LINK`
158164

include/BoostInstall.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if(CMAKE_SOURCE_DIR STREQUAL "${BOOST_SUPERPROJECT_SOURCE_DIR}")
3030
set_property(CACHE BOOST_INSTALL_LAYOUT PROPERTY STRINGS versioned tagged system)
3131

3232
set(BOOST_INSTALL_CMAKEDIR "${__boost_default_cmakedir}" CACHE STRING "Installation directory for CMake configuration files")
33-
set(BOOST_INSTALL_INCLUDE_SUBDIR "${__boost_default_include_subdir}" CACHE STRING "Header subdirectory when layout is versioned")
33+
set(BOOST_INSTALL_INCLUDE_SUBDIR "${__boost_default_include_subdir}" CACHE STRING "Header and data subdirectory when layout is versioned")
3434

3535
else()
3636

@@ -52,6 +52,7 @@ endif()
5252

5353
if(BOOST_INSTALL_LAYOUT STREQUAL "versioned")
5454
string(APPEND CMAKE_INSTALL_INCLUDEDIR "${BOOST_INSTALL_INCLUDE_SUBDIR}")
55+
string(APPEND CMAKE_INSTALL_DATADIR "${BOOST_INSTALL_INCLUDE_SUBDIR}")
5556
endif()
5657

5758
#

0 commit comments

Comments
 (0)