MonetDB: Oct2020 - Fixes to how test modules are created.

[Sjoerd Mullender]

Changeset: f807a6559254 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f807a6559254
Modified Files:
        monetdb5/modules/kernel/CMakeLists.txt
        monetdb5/scheduler/CMakeLists.txt
Branch: Oct2020
Log Message:

Fixes to how test modules are created.


diffs (51 lines):

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
@@ -34,6 +34,8 @@ target_include_directories(kernel
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
 target_include_directories(microbenchmark
+  PRIVATE
+  $<TARGET_PROPERTY:mal,INCLUDE_DIRECTORIES>
   PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -54,10 +56,8 @@ target_link_libraries(kernel
 target_link_libraries(microbenchmark
   PRIVATE
   monetdb_config_header
-  mutils
   bat
-  mal
-  atoms)
+  monetdb5)
 
 set_target_properties(kernel
   PROPERTIES
diff --git a/monetdb5/scheduler/CMakeLists.txt 
b/monetdb5/scheduler/CMakeLists.txt
--- a/monetdb5/scheduler/CMakeLists.txt
+++ b/monetdb5/scheduler/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(run_adder
 target_link_libraries(run_adder
   PRIVATE
   monetdb_config_header
-  mutils
   bat
   monetdb5)
 set_target_properties(run_adder
@@ -47,7 +46,6 @@ target_include_directories(run_isolate
 target_link_libraries(run_isolate
   PRIVATE
   monetdb_config_header
-  mutils
   bat
   monetdb5)
 set_target_properties(run_isolate
@@ -74,7 +72,6 @@ target_include_directories(run_memo
 target_link_libraries(run_memo
   PRIVATE
   monetdb_config_header
-  mutils
   bat
   monetdb5)
 set_target_properties(run_memo
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list