Changeset: b1075af7fe08 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1075af7fe08
Modified Files:
clients/examples/C/CMakeLists.txt
clients/mapiclient/CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/odbc/samples/CMakeLists.txt
cmake/monetdb-defines.cmake
common/stream/CMakeLists.txt
gdk/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/daemon/config/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: mbedded
Log Message:
cleanup cmake code, improving installs
diffs (247 lines):
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -7,16 +7,43 @@
#]]
if(TESTING)
- add_executable(sample0 sample0.c)
- target_link_libraries(sample0 PRIVATE mapi)
- add_executable(sample1 sample1.c)
- target_link_libraries(sample1 PRIVATE mapi)
- add_executable(sample4 sample4.c)
- target_link_libraries(sample4 PRIVATE mapi)
- add_executable(smack00 smack00.c)
- target_link_libraries(smack00 PRIVATE mapi)
- add_executable(smack01 smack01.c)
- target_link_libraries(smack01 PRIVATE mapi)
+ add_executable(sample0
+ sample0.c)
+
+ target_link_libraries(sample0
+ PRIVATE mapi)
+
+ add_executable(sample1
+ sample1.c)
+
+ target_link_libraries(sample1
+ PRIVATE mapi)
+
+ add_executable(sample4
+ sample4.c)
+
+ target_link_libraries(sample4
+ PRIVATE mapi)
- install(TARGETS sample0 sample1 sample4 smack00 smack01 DESTINATION
${BINDIR})
+ add_executable(smack00
+ smack00.c)
+
+ target_link_libraries(smack00
+ PRIVATE mapi)
+
+ add_executable(smack01
+ smack01.c)
+
+ target_link_libraries(smack01
+ PRIVATE mapi)
+
+ install(TARGETS
+ sample0
+ sample1
+ sample4
+ smack00
+ smack01
+ RUNTIME
+ DESTINATION
+ ${CMAKE_INSTALL_BINDIR})
endif()
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -128,4 +128,4 @@ install(TARGETS
install(FILES
mclient.1
msqldump.1
- DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -56,16 +56,8 @@ if (NOT WIN32)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb-mapi.pc
- DESTINATION ${PKGCONFIGDIR})
-endif()
-
-if (NOT WIN32)
- configure_file(monetdb-mapi.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/monetdb-mapi.pc @ONLY)
-
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/monetdb-mapi.pc
- DESTINATION ${PKGCONFIGDIR})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT clientdev)
endif()
install(TARGETS
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -41,6 +41,7 @@ if(TESTING)
testgetinfo
arraytest
testStmtAttr
+ RUNTIME
DESTINATION
- ${BINDIR})
+ ${CMAKE_INSTALL_BINDIR})
endif()
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -55,10 +55,10 @@ function(monetdb_configure_defines)
check_symbol_exists("getaddrinfo" "netdb.h" UNIX_GETADDRINFO)
check_symbol_exists("getaddrinfo" "ws2tcpip.h" WIN_GETADDRINFO)
if(UNIX_GETADDRINF)
- set(HAVE_GETADDRINFO 1 PARENT_SCOPE)
+ set(HAVE_GETADDRINFO 1 PARENT_SCOPE)
endif()
if(WIN_GETADDRINF)
- set(HAVE_GETADDRINFO 1 PARENT_SCOPE)
+ set(HAVE_GETADDRINFO 1 PARENT_SCOPE)
endif()
#check_symbol_exists("WSADATA" "winsock2.h" HAVE_WINSOCK_H)
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -91,7 +91,8 @@ if (NOT WIN32)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb-stream.pc
- DESTINATION ${PKGCONFIGDIR})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT streamdev)
endif()
install(TARGETS
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -115,7 +115,8 @@ if (NOT WIN32)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb-gdk.pc
- DESTINATION ${PKGCONFIGDIR})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT monetdbdev)
endif()
install(TARGETS
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -94,4 +94,5 @@ install(TARGETS
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
+ COMPONENT serverdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -14,11 +14,6 @@ add_library(monetdb5 SHARED
$<TARGET_OBJECTS:optimizer>
$<TARGET_OBJECTS:scheduler>)
-#target_sources(monetdb5
-# PRIVATE
-# monetdb.c
-# libmonetdb5.rc)
-
target_link_libraries(monetdb5
PRIVATE
mutils
@@ -57,7 +52,8 @@ if (NOT WIN32)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb5.pc
- DESTINATION ${PKGCONFIGDIR})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT server)
endif()
install(TARGETS
@@ -79,6 +75,3 @@ install(EXPORT monetdb5Targets
NAMESPACE MonetDB::
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
COMPONENT server)
-
-#configure_file(monetdb5.pc.in ${CMAKE_CURRENT_BINARY_DIR}/monetdb5.pc @ONLY)
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/monetdb5.pc DESTINATION
${PKGCONFIGDIR})
diff --git a/tools/merovingian/client/CMakeLists.txt
b/tools/merovingian/client/CMakeLists.txt
--- a/tools/merovingian/client/CMakeLists.txt
+++ b/tools/merovingian/client/CMakeLists.txt
@@ -41,4 +41,4 @@ install(TARGETS
install(FILES
monetdb.1
- DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
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
@@ -61,7 +61,7 @@ configure_file(monetdbd.1.in
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdbd.1
- DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
install(DIRECTORY
DESTINATION
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
@@ -18,24 +18,13 @@ configure_file(.merovingian_properties.i
${CMAKE_CURRENT_BINARY_DIR}/.merovingian_properties
@ONLY)
-install(DIRECTORY
- DESTINATION
- ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
-
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdbd
- DESTINATION ${SYSCONFDIR}/logrotate.d)
-
-install(DIRECTORY
- DESTINATION
- ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdbd.service
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
-
-install(DIRECTORY
- DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/monetdb5/dbfarm)
+ DESTINATION lib/systemd/system)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/.merovingian_properties
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -87,7 +87,7 @@ configure_file(mserver5.1.in
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/mserver5.1
- DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR})
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/monetdb5/dbfarm)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
