1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
|
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Tue, 14 Oct 2025 12:32:22 +0200
Subject: Install CMake config to LIBDIR
---
dynamicEDT3D/CMakeLists.txt | 4 ++--
dynamicEDT3D/src/CMakeLists.txt | 2 +-
octomap/CMakeLists.txt | 6 +++---
octomap/src/CMakeLists.txt | 2 +-
octovis/CMakeLists.txt | 4 ++--
octovis/CMakeLists_src.txt | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
index 29d19a6..6029c09 100644
--- a/dynamicEDT3D/CMakeLists.txt
+++ b/dynamicEDT3D/CMakeLists.txt
@@ -123,7 +123,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(
dynamicEDT3DConfig.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake"
PATH_VARS DYNAMICEDT3D_INCLUDE_DIRS DYNAMICEDT3D_LIB_DIR
- INSTALL_DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/dynamicEDT3D")
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dynamicEDT3D")
WRITE_BASIC_PACKAGE_VERSION_FILE(
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig-version.cmake"
@@ -133,7 +133,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(
install(FILES
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake"
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig-version.cmake"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/dynamicEDT3D")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dynamicEDT3D")
# Write pkgconfig-file:
include(InstallPkgConfigFile)
diff --git a/dynamicEDT3D/src/CMakeLists.txt b/dynamicEDT3D/src/CMakeLists.txt
index 83b5e99..9180310 100644
--- a/dynamicEDT3D/src/CMakeLists.txt
+++ b/dynamicEDT3D/src/CMakeLists.txt
@@ -37,4 +37,4 @@ install(TARGETS dynamicedt3d dynamicedt3d-static
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}
)
-install(EXPORT dynamicEDT3DTargets DESTINATION "${CMAKE_INSTALL_DATADIR}/dynamicEDT3D")
+install(EXPORT dynamicEDT3DTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dynamicEDT3D")
diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
index 63f1501..a827249 100644
--- a/octomap/CMakeLists.txt
+++ b/octomap/CMakeLists.txt
@@ -115,7 +115,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(
octomap-config.cmake.in
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-config.cmake"
PATH_VARS OCTOMAP_INCLUDE_DIRS OCTOMAP_LIB_DIR
- INSTALL_DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/octomap")
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octomap")
WRITE_BASIC_PACKAGE_VERSION_FILE(
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-config-version.cmake"
@@ -135,7 +135,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(
octomap-config.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake"
PATH_VARS OCTOMAP_INCLUDE_DIRS OCTOMAP_LIB_DIR
- INSTALL_DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/octomap")
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octomap")
WRITE_BASIC_PACKAGE_VERSION_FILE(
${PROJECT_BINARY_DIR}/InstallFiles/octomap-config-version.cmake
@@ -145,7 +145,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(
install(FILES
"${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake"
"${PROJECT_BINARY_DIR}/InstallFiles/octomap-config-version.cmake"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/octomap")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octomap")
# Write pkgconfig-file:
include(InstallPkgConfigFile)
diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt
index 3ffca58..2bb98f4 100644
--- a/octomap/src/CMakeLists.txt
+++ b/octomap/src/CMakeLists.txt
@@ -74,7 +74,7 @@ install(TARGETS octomap octomap-static
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}
)
-install(EXPORT octomap-targets DESTINATION "${CMAKE_INSTALL_DATADIR}/octomap")
+install(EXPORT octomap-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octomap")
install(TARGETS
graph2tree
diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
index ebddde2..ec694e4 100644
--- a/octovis/CMakeLists.txt
+++ b/octovis/CMakeLists.txt
@@ -138,7 +138,7 @@ IF(BUILD_VIEWER)
octovis-config.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/octovis-config.cmake"
PATH_VARS OCTOVIS_INCLUDE_DIRS OCTOVIS_LIB_DIR
- INSTALL_DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/octovis")
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octovis")
WRITE_BASIC_PACKAGE_VERSION_FILE(
"${PROJECT_BINARY_DIR}/InstallFiles/octovis-config-version.cmake"
@@ -148,7 +148,7 @@ IF(BUILD_VIEWER)
install(FILES
"${PROJECT_BINARY_DIR}/InstallFiles/octovis-config.cmake"
"${PROJECT_BINARY_DIR}/InstallFiles/octovis-config-version.cmake"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/octovis")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octovis")
# #installation:
# # store all header files to install:
diff --git a/octovis/CMakeLists_src.txt b/octovis/CMakeLists_src.txt
index 364ca95..017b205 100644
--- a/octovis/CMakeLists_src.txt
+++ b/octovis/CMakeLists_src.txt
@@ -161,7 +161,7 @@ install(TARGETS octovis octovis-static octovis-shared
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}
)
-install(EXPORT octovis-targets DESTINATION "${CMAKE_INSTALL_DATADIR}/octovis")
+install(EXPORT octovis-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/octovis")
file(GLOB octovis_HDRS ${PROJECT_SOURCE_DIR}/include/octovis/*.h)
# filter generated headers for GUI:
|