Skip to content

Commit 3af31bb

Browse files
committed
cmake/install: install packages to libdir instead of datadir
The modular build has a static library that is architecture-dependent. This library contains the module initialization symbol for the `ctre` module.
1 parent 7f9ffc4 commit 3af31bb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ endif()
134134
configure_package_config_file(
135135
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in"
136136
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
137-
INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}"
137+
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
138138
NO_SET_AND_CHECK_MACRO
139139
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
140140

@@ -143,13 +143,13 @@ write_basic_package_version_file(ctre-config-version.cmake
143143
COMPATIBILITY SameMajorVersion)
144144

145145
install(EXPORT ${PROJECT_NAME}-targets
146-
DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}"
146+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
147147
NAMESPACE ${PROJECT_NAME}::)
148148
install(
149149
FILES
150150
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
151151
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
152-
DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME})
152+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
153153
install(DIRECTORY include/ DESTINATION include
154154
FILES_MATCHING PATTERN *.hpp)
155155

@@ -186,7 +186,7 @@ set(CPACK_RPM_PACKAGE_NAME "lib${PROJECT_NAME}-devel")
186186
set(PKG_CONFIG_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc")
187187
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/packaging/pkgconfig.pc.in" "${PKG_CONFIG_FILE_NAME}" @ONLY)
188188
install(FILES "${PKG_CONFIG_FILE_NAME}"
189-
DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig"
189+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
190190
)
191191

192192
list(APPEND CPACK_SOURCE_IGNORE_FILES /.git/ /build/ .gitignore .DS_Store)

0 commit comments

Comments
 (0)