Changeset: 62c0b6e85cbd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/62c0b6e85cbd
Modified Files:
sql/backends/monet5/CMakeLists.txt
sql/common/CMakeLists.txt
sql/server/CMakeLists.txt
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
Branch: Mar2025
Log Message:
Try to include each static library at most once during linking.
diffs (133 lines):
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -180,6 +180,8 @@ target_include_directories(sql
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:kernel,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlstorage,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -187,11 +189,7 @@ target_include_directories(sql
target_link_libraries(sql
PRIVATE
monetdb_config_header
- sqlstorage
- sqlcommon
- batstore
sqlserver
- sqlparserlib
sqlinclude
copybinary
monetdb5
diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt
--- a/sql/common/CMakeLists.txt
+++ b/sql/common/CMakeLists.txt
@@ -40,8 +40,7 @@ target_link_libraries(sqlcommon
matomic
stream
bat
- sqlinclude
- sqlstorage)
+ sqlinclude)
target_compile_definitions(sqlcommon
PRIVATE
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -100,6 +100,8 @@ target_include_directories(sqlserver
$<TARGET_PROPERTY:atoms,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlstorage,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -109,9 +111,7 @@ target_link_libraries(sqlserver
monetdb_config_header
bat
sqlparserlib
- sqlcommon
- sqlinclude
- sqlstorage)
+ sqlinclude)
target_compile_definitions(sqlserver
PRIVATE
@@ -148,6 +148,7 @@ target_include_directories(sqlparserlib
$<TARGET_PROPERTY:atoms,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -156,7 +157,6 @@ target_link_libraries(sqlparserlib
PRIVATE
monetdb_config_header
bat
- sqlcommon
sqlinclude
sqlstorage)
@@ -182,6 +182,7 @@ target_include_directories(sqlparse
PRIVATE
$<$<PLATFORM_ID:Windows>:${HAVE_GETOPT_H}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -193,7 +194,6 @@ target_link_libraries(sqlparse
stream
bat
sqlinclude
- sqlcommon
mutils
$<$<NOT:$<PLATFORM_ID:Windows>>:m>
$<$<PLATFORM_ID:Windows>:${GETOPT_LIB}>
diff --git a/sql/storage/CMakeLists.txt b/sql/storage/CMakeLists.txt
--- a/sql/storage/CMakeLists.txt
+++ b/sql/storage/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(sqlstorage
target_include_directories(sqlstorage
PRIVATE
$<TARGET_PROPERTY:mapi,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -36,7 +37,7 @@ target_link_libraries(sqlstorage
PRIVATE
monetdb_config_header
bat
- sqlcommon
+ batstore
sqlinclude)
if(NOT MONETDB_STATIC)
diff --git a/sql/storage/bat/CMakeLists.txt b/sql/storage/bat/CMakeLists.txt
--- a/sql/storage/bat/CMakeLists.txt
+++ b/sql/storage/bat/CMakeLists.txt
@@ -30,6 +30,7 @@ target_include_directories(batstore
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:kernel,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlstorage,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -39,8 +40,7 @@ target_link_libraries(batstore
monetdb_config_header
bat
sqlcommon
- sqlinclude
- sqlstorage)
+ sqlinclude)
if(NOT MONETDB_STATIC)
set_target_properties(batstore
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
