MonetDB: Oct2020 - Clean up cmake use: no more unused direct dep...

[Sjoerd Mullender]

Changeset: d380208bdda9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d380208bdda9
Modified Files:
        clients/mapiclient/CMakeLists.txt
        common/utils/CMakeLists.txt
        gdk/CMakeLists.txt
        tools/merovingian/daemon/CMakeLists.txt
        tools/monetdbe/CMakeLists.txt
        tools/mserver/CMakeLists.txt
Branch: Oct2020
Log Message:

Clean up cmake use: no more unused direct dependencies at all anymore.


diffs (136 lines):

diff --git a/clients/mapiclient/CMakeLists.txt 
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -17,16 +17,12 @@ target_sources(mcutil
   PRIVATE
   dump.c
   dotmonetdb.c
-  dotmonetdb.h
-  eventparser.c
-  eventparser.h)
+  dotmonetdb.h)
 
 target_link_libraries(mcutil
   PRIVATE
   monetdb_config_header
-  mutils
-  mcrypt
-  moptions
+  mstring
   mapi
   stream)
 
@@ -50,6 +46,7 @@ target_link_libraries(mclient
   mcutil
   mprompt
   moptions
+  mutils
   mapi
   stream
   $<$<BOOL:${READLINE_FOUND}>:Readline::Readline>
@@ -72,6 +69,7 @@ target_link_libraries(msqldump
   monetdb_config_header
   mcutil
   moptions
+  mutils
   mapi
   stream
   mprompt
@@ -81,7 +79,9 @@ add_executable(stethoscope)
 
 target_sources(stethoscope
   PRIVATE
-  stethoscope.c)
+  stethoscope.c
+  eventparser.c
+  eventparser.h)
 
 target_include_directories(stethoscope
   PRIVATE
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -116,6 +116,13 @@ target_include_directories(matomic
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
 
+add_library(mstring INTERFACE)
+
+target_include_directories(mstring
+  INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
+
 add_library(mprompt STATIC)
 
 target_sources(mprompt
@@ -151,6 +158,17 @@ install(EXPORT matomicTargets
   DESTINATION ${EXPORT_TARGET_PATH}
   COMPONENT monetdbdev)
 
+install(TARGETS
+  mstring
+  EXPORT mstringTargets
+  COMPONENT monetdbdev)
+
+install(EXPORT mstringTargets
+  FILE mstringTargets.cmake
+  NAMESPACE MonetDB::
+  DESTINATION ${EXPORT_TARGET_PATH}
+  COMPONENT monetdbdev)
+
 install(FILES
   matomic.h
   mstring.h
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -85,6 +85,7 @@ target_include_directories(bat
   PUBLIC
   $<TARGET_PROPERTY:stream,INTERFACE_INCLUDE_DIRECTORIES>
   $<TARGET_PROPERTY:matomic,INTERFACE_INCLUDE_DIRECTORIES>
+  $<TARGET_PROPERTY:mstring,INTERFACE_INCLUDE_DIRECTORIES>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
 
@@ -92,6 +93,7 @@ target_link_libraries(bat
   PRIVATE
   stream
   matomic
+  mstring
   monetdb_config_header
   moptions
   mutils
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
@@ -37,7 +37,6 @@ target_link_libraries(monetdbd
   stream
   mapi
   msabaoth
-  ${CMAKE_DL_LIBS}
   Threads::Threads)
 
 install(TARGETS
diff --git a/tools/monetdbe/CMakeLists.txt b/tools/monetdbe/CMakeLists.txt
--- a/tools/monetdbe/CMakeLists.txt
+++ b/tools/monetdbe/CMakeLists.txt
@@ -52,7 +52,6 @@ target_link_libraries(monetdbe
   matomic
   moptions
   mutils
-  mcrypt
   stream
   bat
   monetdb5
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -78,7 +78,6 @@ target_link_libraries(shutdowntest
   moptions
   sql
   mutils
-  mcrypt
   bat
   stream
   monetdb5
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list