Skip to content

Commit 8c94f42

Browse files
committed
cmake/install: enable installation for the modules build
1 parent 3af31bb commit 8c94f42

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ if(CTRE_MODULE)
100100
endif()
101101

102102
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_${CTRE_CXX_STANDARD})
103+
104+
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets
105+
FILE_SET CXX_MODULES DESTINATION "${CMAKE_INSTALL_LIBDIR}/cxx/${PROJECT_NAME}"
106+
FILE_SET HEADERS DESTINATION "include")
103107
else()
104108
message(FATAL_ERROR "unsupported cmake for c++ modules")
105109
endif()
@@ -118,12 +122,12 @@ else()
118122
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_SCAN_FOR_MODULES 0)
119123

120124
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets)
125+
install(DIRECTORY include/ DESTINATION include
126+
FILES_MATCHING PATTERN *.hpp)
121127
endif()
122128

123129
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
124130

125-
if (NOT CTRE_MODULE)
126-
127131
if (NOT EXISTS "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in")
128132
file(WRITE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in [[
129133
@PACKAGE_INIT@
@@ -150,8 +154,6 @@ install(
150154
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
151155
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
152156
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
153-
install(DIRECTORY include/ DESTINATION include
154-
FILES_MATCHING PATTERN *.hpp)
155157

156158
if(CTRE_BUILD_TESTS)
157159
add_subdirectory(tests)
@@ -192,5 +194,3 @@ install(FILES "${PKG_CONFIG_FILE_NAME}"
192194
list(APPEND CPACK_SOURCE_IGNORE_FILES /.git/ /build/ .gitignore .DS_Store)
193195

194196
include(CPack)
195-
196-
endif()

0 commit comments

Comments
 (0)