Changeset: ddf02aa51711 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddf02aa51711
Modified Files:
CMakeLists.txt
clients/mapilib/CMakeLists.txt
common/stream/CMakeLists.txt
common/utils/CMakeLists.txt
gdk/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
tools/monetdbe/CMakeLists.txt
Branch: default
Log Message:
set path for export target configs
diffs (117 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,10 @@ monetdb_configure_crypto()
monetdb_configure_sizes()
include(GNUInstallDirs)
+# The documentation is unclear on what is the best location to install
+# the configuration for the exported targets, especially when building
+# the packages (deb/rpm). For now set the variable to a reasonable value
+set(EXPORT_TARGET_PATH "${CMAKE_INSTALL_DATAROOTDIR}/monetdb/cmake")
# Define the macro variables after configuring the install directories.
# Some variables define additional installation settings.
@@ -128,7 +132,7 @@ install(TARGETS
install(EXPORT monetdb_config_headerTargets
FILE monetdb_config_headerTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
install(FILES
@@ -159,7 +163,7 @@ endif()
include(CMakePackageConfigHelpers)
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake"
- INSTALL_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cmake)"
+ INSTALL_DESTINATION "${EXPORT_TARGET_PATH}"
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
@@ -170,7 +174,7 @@ write_basic_package_version_file(
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
include(monetdb-packages)
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -79,7 +79,7 @@ install(TARGETS
install(EXPORT mapiTargets
FILE mapiTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT clientdev)
# vim: set ts=2:sw=2:et
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -116,5 +116,5 @@ install(TARGETS
install(EXPORT streamTargets
FILE streamTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT streamdev)
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -170,7 +170,7 @@ install(TARGETS
install(EXPORT matomicTargets
FILE matomicTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
install(FILES
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -140,5 +140,5 @@ install(TARGETS
install(EXPORT gdkTargets
FILE gdkTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -74,7 +74,7 @@ install(TARGETS
install(EXPORT monetdb5Targets
FILE monetdb5Targets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT serverdev)
# vim: set ts=2:sw=2:et
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -160,5 +160,5 @@ target_include_directories(sqlembedded
install(EXPORT sqlTargets
FILE sqlTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
diff --git a/tools/monetdbe/CMakeLists.txt b/tools/monetdbe/CMakeLists.txt
--- a/tools/monetdbe/CMakeLists.txt
+++ b/tools/monetdbe/CMakeLists.txt
@@ -73,5 +73,5 @@ install(TARGETS
install(EXPORT monetdbeTargets
FILE monetdbeTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT serverdev)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
