Skip to content

Commit 7738389

Browse files
committed
Install as arch-independent
xternsor is header only library, so prefer arch-independed paths for pkgconfig and cmake. See for reference: xtensor-stack/xtl@d877d94
1 parent bffa0ce commit 7738389

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ export(EXPORT ${PROJECT_NAME}-targets
261261
install(FILES ${XTENSOR_HEADERS}
262262
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor)
263263

264-
set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
264+
set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE
265265
STRING "install path for xtensorConfig.cmake")
266266

267267
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
@@ -288,7 +288,7 @@ configure_file(${PROJECT_NAME}.pc.in
288288
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
289289
@ONLY)
290290
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
291-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
291+
DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")
292292

293293
# Write single include
294294
# ====================

xtensor.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: xtensor

0 commit comments

Comments
 (0)