Changeset: 9d365fdf98c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d365fdf98c3
Modified Files:
cmake/monetdb-deb-packages.cmake
cmake/monetdb-functions.cmake
Branch: Oct2020
Log Message:
Parameterize package names.
diffs (50 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
@@ -61,7 +61,7 @@ set(CPACK_COMPONENT_STREAMDEV_DESCRIPTIO
accelerators. It also has an SQL front end.
.
This package contains the files to develop with the
- libmonetdb-stream13 library.")
+ libmonetdb-stream${STREAM_VERSION_MAJOR} library.")
set(CPACK_DEBIAN_CLIENT_PACKAGE_NAME "libmonetdb-client${MAPI_VERSION_MAJOR}")
set(CPACK_DEBIAN_CLIENT_PACKAGE_DEPENDS "\\\${shlibs:Depends},
\\\${misc:Depends}")
@@ -82,7 +82,7 @@ set(CPACK_COMPONENT_CLIENTDEV_DESCRIPTIO
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
.
- This package contains the files to develop with the libmonetdb-client12
+ This package contains the files to develop with the
libmonetdb-client${MAPI_VERSION_MAJOR}
library.")
set(CPACK_DEBIAN_MCLIENT_PACKAGE_NAME "monetdb-client")
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -257,7 +257,7 @@ function(monetdb_debian_extra_files)
${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-client12
+ ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-client${MAPI_VERSION_MAJOR}
COMPONENT client)
install(FILES
@@ -285,14 +285,14 @@ function(monetdb_debian_extra_files)
${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-stream13
+ ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-stream${STREAM_VERSION_MAJOR}
COMPONENT stream)
install(FILES
${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb19
+ ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb${GDK_VERSION_MAJOR}
COMPONENT monetdb)
install(FILES
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
