Changeset: a6430d38790a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6430d38790a
Modified Files:
cmake/monetdb-deb-packages.cmake
cmake/monetdb-rpm-packages.cmake
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/scheduler/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/daemon/config/CMakeLists.txt
tools/monetdbe/CMakeLists.txt
Branch: Oct2020
Log Message:
small cmake fixes for building packages
diffs (239 lines):
diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake
--- a/cmake/monetdb-deb-packages.cmake
+++ b/cmake/monetdb-deb-packages.cmake
@@ -8,7 +8,7 @@
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB BV <i...@monetdb.org>")
set(CPACK_DEB_COMPONENT_INSTALL ON)
-set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS OFF)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
set(CPACK_DEBIAN_PACKAGE_SOURCE "monetdb")
@@ -171,18 +171,6 @@ set(CPACK_DEBIAN_SERVER_PACKAGE_CONTROL_
${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.postinst
)
-set(CPACK_DEBIAN_HUGEINT_PACKAGE_NAME "monetdb5-server-hugeint")
-set(CPACK_DEBIAN_HUGEINT_PACKAGE_DEPENDS "monetdb5-server (=
\\\${source:Version})")
-set(CPACK_DEBIAN_HUGEINT_PACKAGE_ARCHITECTURE "amd64")
-set(CPACK_COMPONENT_HUGEINT_DESCRIPTION "MonetDB - 128-bit integer support for
MonetDB5-server
- MonetDB is a database management system that is developed from a
- main-memory perspective with use of a fully decomposed storage model,
- automatic index management, extensibility of data types and search
- accelerators. It also has an SQL front end.
- .
- This package provides HUGEINT (128-bit integer) support for the
- MonetDB5-server component.")
-
set(CPACK_DEBIAN_SERVERDEV_PACKAGE_NAME "monetdb5-server-dev")
set(CPACK_DEBIAN_SERVERDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends},
\\\${misc:Depends},
monetdb5-server (= \\\${source:Version}), libmonetdb-dev (=
\\\${source:Version})")
@@ -200,8 +188,6 @@ set(CPACK_DEBIAN_SQL_PACKAGE_DEPENDS
"\\\${shlibs:Depends}"
"\\\${misc:Depends}"
"monetdb5-server (= \\\${source:Version})")
-set(CPACK_DEBIAN_SQL_PACKAGE_RECOMMENDS
- "monetdb5-sql-hugeint (= \\\${source:Version}) [amd64]")
set(CPACK_DEBIAN_SQL_PACKAGE_SUGGEST "monetdb-client (= \\\${source:Version})")
set(CPACK_COMPONENT_SQL_DESCRIPTION "MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
@@ -218,20 +204,6 @@ set(CPACK_DEBIAN_SQL_PACKAGE_CONTROL_FIL
${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-sql.postinst
)
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_NAME "monetdb5-sql-hugeint")
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_DEPENDS
- "monetdb5-sql (= \\\${source:Version})"
- "monetdb5-server-hugeint (= \\\${source:Version})")
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_ARCHITECTURE "amd64")
-set(CPACK_COMPONENT_SQLINT128_DESCRIPTION "MonetDB5 128 bit integer (hugeint)
support for SQL
- MonetDB is a database management system that is developed from a
- main-memory perspective with use of a fully decomposed storage model,
- automatic index management, extensibility of data types and search
- accelerators. It also has an SQL front end.
- .
- This package provides HUGEINT (128-bit integer) support for the SQL
- front end of MonetDB.")
-
set(CPACK_DEBIAN_PYAPI3_PACKAGE_NAME "monetdb-python3")
set(CPACK_DEBIAN_PYAPI3_PACKAGE_DEPENDS
"\\\${shlibs:Depends}"
diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake
--- a/cmake/monetdb-rpm-packages.cmake
+++ b/cmake/monetdb-rpm-packages.cmake
@@ -87,18 +87,13 @@ set(CPACK_RPM_server_PACKAGE_NAME "Monet
set(CPACK_RPM_server_FILE_NAME
"${CPACK_RPM_server_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_server_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
set(CPACK_RPM_server_PACKAGE_REQUIRES "%{name}-client%{?_isa} =
%{version}-%{release}")
-# TODO: check for hugeint
-set(CPACK_RPM_server_PACKAGE_RECOMMENDS "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}, MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}")
+set(CPACK_RPM_server_PACKAGE_RECOMMENDS "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
+
set(CPACK_RPM_server_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_server_PACKAGE_CONFLICTS "python-pymonetdb < 1.0.6")
# TODO: check for rhel
set(CPACK_RPM_server_PACKAGE_REQUIRES_PRE "shadow-utils, systemd")
-set(CPACK_RPM_hugeint_PACKAGE_NAME "MonetDB5-server-hugeint")
-set(CPACK_RPM_hugeint_FILE_NAME
"${CPACK_RPM_hugeint_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_hugeint_PACKAGE_SUMMARY "MonetDB - 128-bit integer support for
MonetDB5-server")
-set(CPACK_RPM_hugeint_PACKAGE_REQUIRES "MonetDB5-server%{?_isa}")
-
set(CPACK_RPM_serverdev_PACKAGE_NAME "MonetDB5-server-devel")
set(CPACK_RPM_serverdev_FILE_NAME
"${CPACK_RPM_serverdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_serverdev_PACKAGE_SUMMARY "MonetDB development files")
@@ -108,16 +103,9 @@ set(CPACK_RPM_sql_PACKAGE_NAME "SQL-serv
set(CPACK_RPM_sql_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_sql_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_sql_PACKAGE_SUMMARY "MonetDB5 SQL server modules")
set(CPACK_RPM_sql_PACKAGE_REQUIRES_PRE "MonetDB5-server%{?_isa} =
%{version}-%{release}")
-# TODO: check hugeint
-set(CPACK_RPM_sql_PACKAGE_RECOMMENDS "%{name}-SQL-server5-hugeint%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_sql_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
# TODO: systemd_requires?
-set(CPACK_RPM_sqlint128_PACKAGE_NAME "SQL-server5-hugeint")
-set(CPACK_RPM_sqlint128_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_sqlint128_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_sqlint128_PACKAGE_SUMMARY "MonetDB5 128 bit integer (hugeint)
support for SQL")
-set(CPACK_RPM_sqlint128_PACKAGE_REQUIRES "MonetDB5-server-hugeint%{?_isa} =
%{version}-%{release}, MonetDB-SQL-server5%{?_isa} = %{version}-%{release}")
-
set(CPACK_RPM_testing_PACKAGE_NAME "testing")
set(CPACK_RPM_testing_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_testing_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_TESTING_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
diff --git a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
@@ -38,4 +38,5 @@ set_target_properties(opt_sql_append
install(TARGETS
opt_sql_append
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT server)
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -67,9 +67,11 @@ set_target_properties(microbenchmark
PROPERTIES
OUTPUT_NAME _microbenchmark)
-install(TARGETS microbenchmark
+install(TARGETS
+ microbenchmark
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT microbenchmark)
install(FILES
microbenchmark.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT microbenchmark)
diff --git a/monetdb5/scheduler/CMakeLists.txt
b/monetdb5/scheduler/CMakeLists.txt
--- a/monetdb5/scheduler/CMakeLists.txt
+++ b/monetdb5/scheduler/CMakeLists.txt
@@ -30,7 +30,8 @@ install(TARGETS run_adder
COMPONENT run_adder)
install(FILES
run_adder.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_adder)
add_library(run_isolate MODULE)
target_sources(run_isolate
@@ -55,7 +56,8 @@ install(TARGETS run_isolate
COMPONENT run_isolate)
install(FILES
run_isolate.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_isolate)
add_library(run_memo MODULE)
target_sources(run_memo
@@ -81,4 +83,5 @@ install(TARGETS run_memo
COMPONENT run_memo)
install(FILES
run_memo.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_memo)
diff --git a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
--- a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
@@ -55,7 +55,8 @@ if(NETCDF_FOUND)
PRIVATE
LIBNCDF)
- install(TARGETS netcdff
- DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ install(TARGETS
+ netcdff
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT server)
endif()
diff --git a/sql/backends/monet5/vaults/shp/CMakeLists.txt
b/sql/backends/monet5/vaults/shp/CMakeLists.txt
--- a/sql/backends/monet5/vaults/shp/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/shp/CMakeLists.txt
@@ -54,7 +54,8 @@ if(GDAL_FOUND)
PRIVATE
LIBGTIFF)
- install(TARGETS shp
- DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ install(TARGETS
+ shp
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT server)
endif()
diff --git a/tools/merovingian/daemon/CMakeLists.txt
b/tools/merovingian/daemon/CMakeLists.txt
--- a/tools/merovingian/daemon/CMakeLists.txt
+++ b/tools/merovingian/daemon/CMakeLists.txt
@@ -67,12 +67,12 @@ install(FILES
install(DIRECTORY
DESTINATION
- ${CMAKE_INSTALL_FULL_SYSCONFDIR}/tmpfiles.d
+ ${CMAKE_INSTALL_SYSCONFDIR}/tmpfiles.d
COMPONENT sql)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdbd.conf
- DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/tmpfiles.d
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/tmpfiles.d
COMPONENT sql)
add_subdirectory(config)
diff --git a/tools/merovingian/daemon/config/CMakeLists.txt
b/tools/merovingian/daemon/config/CMakeLists.txt
--- a/tools/merovingian/daemon/config/CMakeLists.txt
+++ b/tools/merovingian/daemon/config/CMakeLists.txt
@@ -20,7 +20,7 @@ configure_file(.merovingian_properties.i
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdbd
- DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d
COMPONENT sql)
install(FILES
@@ -31,7 +31,7 @@ install(FILES
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/.merovingian_properties
.merovingian_lock
- DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/monetdb5/dbfarm
+ DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/monetdb5/dbfarm
COMPONENT sql)
install(DIRECTORY
diff --git a/tools/monetdbe/CMakeLists.txt b/tools/monetdbe/CMakeLists.txt
--- a/tools/monetdbe/CMakeLists.txt
+++ b/tools/monetdbe/CMakeLists.txt
@@ -83,6 +83,7 @@ install(TARGETS
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
+ COMPONENT server
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(EXPORT monetdbeTargets
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
