Skip to content

Commit d877d94

Browse files
committed
Install as arch-independent
Since this is a header-only library, it can be declared ARCH_INDEPENDENT (disabling the pointer size of the original system from being persisted in the generated CMake files) and can be installed in DATAROOTDIR (usr/share/cmake) instead of LIBDIR (eg, usr/lib/x86_64-linux-gnu/cmake on some platforms). This benefits downstreams which then don't need to duplicate the configuration files across different architectures.
1 parent 31cc071 commit d877d94

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ install(FILES ${XTL_HEADERS}
121121
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl)
122122
endif()
123123

124-
set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
124+
set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE
125125
STRING "install path for xtlConfig.cmake")
126126

127127
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
@@ -135,7 +135,8 @@ set(_XTL_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
135135
unset(CMAKE_SIZEOF_VOID_P)
136136
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
137137
VERSION ${${PROJECT_NAME}_VERSION}
138-
COMPATIBILITY AnyNewerVersion)
138+
COMPATIBILITY AnyNewerVersion
139+
ARCH_INDEPENDENT)
139140
set(CMAKE_SIZEOF_VOID_P ${_XTL_CMAKE_SIZEOF_VOID_P})
140141
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
141142
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
@@ -148,4 +149,4 @@ configure_file(${PROJECT_NAME}.pc.in
148149
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
149150
@ONLY)
150151
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
151-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
152+
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")

xtl.pc.in

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
2-
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
32
includedir=${prefix}/include
43

54
Name: xtl

0 commit comments

Comments
 (0)