Changeset: 911e664eca03 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=911e664eca03
Modified Files:
ctest/monetdb5/mal/CMakeLists.txt
gdk/CMakeLists.txt
geom/lib/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
sql/backends/monet5/UDF/udf/CMakeLists.txt
sql/backends/monet5/generator/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
sql/common/CMakeLists.txt
sql/server/CMakeLists.txt
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/monetdbe/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: oscar
Log Message:
Revert to libbat instead of libgdk: the latter is already taken (by GTK).
diffs (truncated from 359 to 300 lines):
diff --git a/ctest/monetdb5/mal/CMakeLists.txt
b/ctest/monetdb5/mal/CMakeLists.txt
--- a/ctest/monetdb5/mal/CMakeLists.txt
+++ b/ctest/monetdb5/mal/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(test_malEmbeddedBo
PRIVATE
monetdb_config_header
mcrypt
- gdk
+ bat
mal
${CMAKE_DL_LIBS}
Threads::Threads)
@@ -23,7 +23,7 @@ target_link_libraries(test_malInclude
PRIVATE
monetdb_config_header
mcrypt
- gdk
+ bat
mal
${CMAKE_DL_LIBS}
Threads::Threads)
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -30,9 +30,9 @@ set(gdk_public_headers
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_calc.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_cand.h>)
-add_library(gdk SHARED)
+add_library(bat SHARED)
-target_sources(gdk
+target_sources(bat
PRIVATE
gdk_select.c
gdk_calc.c gdk_calc.h
@@ -81,12 +81,12 @@ target_sources(gdk
PUBLIC
${gdk_public_headers})
-target_include_directories(gdk
+target_include_directories(bat
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_link_libraries(gdk
+target_link_libraries(bat
PUBLIC
stream
matomic
@@ -101,11 +101,11 @@ target_link_libraries(gdk
Threads::Threads)
# This definition is also used in Linux
-target_compile_definitions(gdk
+target_compile_definitions(bat
PRIVATE
LIBGDK)
-set_target_properties(gdk
+set_target_properties(bat
PROPERTIES
VERSION ${GDK_VERSION}
SOVERSION ${GDK_VERSION_MAJOR}
@@ -122,7 +122,7 @@ if (NOT WIN32)
endif()
install(TARGETS
- gdk
+ bat
EXPORT gdkTargets
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -24,7 +24,7 @@ if(GEOS_FOUND)
PRIVATE
mutils
stream
- gdk
+ bat
Geos::Geos
$<$<BOOL:${PROJ_FOUND}>:PROJ::PROJ>)
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -40,7 +40,7 @@ if(GEOS_FOUND)
PRIVATE
mutils
stream
- gdk
+ bat
geomlib
monetdb5
sql
diff --git a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(opt_sql_append
monetdb_config_header
mutils
stream
- gdk
+ bat
monetdb5)
target_compile_definitions(opt_sql_append
diff --git a/monetdb5/extras/rapi/CMakeLists.txt
b/monetdb5/extras/rapi/CMakeLists.txt
--- a/monetdb5/extras/rapi/CMakeLists.txt
+++ b/monetdb5/extras/rapi/CMakeLists.txt
@@ -26,7 +26,7 @@ if(LIBR_FOUND)
monetdb_config_header
mutils
stream
- gdk
+ bat
monetdb5
sqlinclude
LibR::LibR)
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -79,7 +79,7 @@ target_link_libraries(mal
monetdb_config_header
mutils
mapi
- gdk)
+ bat)
set_target_properties(mal
PROPERTIES
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(atoms
PRIVATE
monetdb_config_header
mutils
- gdk
+ bat
mal)
if(WIN32)
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
@@ -44,7 +44,7 @@ target_link_libraries(kernel
PRIVATE
monetdb_config_header
mutils
- gdk
+ bat
mal
atoms)
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(monetdb5
$<$<BOOL:${LibXml2_FOUND}>:LibXml2::LibXml2>
$<$<BOOL:${PCRE_FOUND}>:PCRE::PCRE>
$<$<BOOL:${UUID_FOUND}>:UUID::UUID>
- gdk)
+ bat)
set_target_properties(monetdb5
PROPERTIES
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
@@ -106,7 +106,7 @@ target_link_libraries(sql
PRIVATE
monetdb_config_header
mcrypt
- gdk
+ bat
monetdb5
sqlstorage
sqlcommon
diff --git a/sql/backends/monet5/UDF/capi/CMakeLists.txt
b/sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt
@@ -28,7 +28,7 @@ if(CINTEGRATION)
PRIVATE
mutils
stream
- gdk
+ bat
monetdb5
monetdb_config_header)
diff --git a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
@@ -49,7 +49,7 @@ if(HAVE_LIBPY3)
sql
mutils
stream
- gdk
+ bat
monetdb5
monetdb_config_header)
diff --git a/sql/backends/monet5/UDF/udf/CMakeLists.txt
b/sql/backends/monet5/UDF/udf/CMakeLists.txt
--- a/sql/backends/monet5/UDF/udf/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/udf/CMakeLists.txt
@@ -37,7 +37,7 @@ target_link_libraries(udf
PRIVATE
mutils
stream
- gdk
+ bat
monetdb5
sql
monetdb_config_header)
diff --git a/sql/backends/monet5/generator/CMakeLists.txt
b/sql/backends/monet5/generator/CMakeLists.txt
--- a/sql/backends/monet5/generator/CMakeLists.txt
+++ b/sql/backends/monet5/generator/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(generator
target_link_libraries(generator
PRIVATE
monetdb_config_header
- gdk
+ bat
monetdb5
sql)
diff --git a/sql/backends/monet5/vaults/fits/CMakeLists.txt
b/sql/backends/monet5/vaults/fits/CMakeLists.txt
--- a/sql/backends/monet5/vaults/fits/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/fits/CMakeLists.txt
@@ -45,7 +45,7 @@ if(HAVE_FITS)
monetdb_config_header
mutils
stream
- gdk
+ bat
monetdb5
sqlinclude
CFitsIO::CFitsIO)
diff --git a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
--- a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NETCDF_FOUND)
monetdb_config_header
mutils
stream
- gdk
+ bat
monetdb5
sqlinclude
NetCDF::NetCDF)
diff --git a/sql/backends/monet5/vaults/shp/CMakeLists.txt
b/sql/backends/monet5/vaults/shp/CMakeLists.txt
--- a/sql/backends/monet5/vaults/shp/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/shp/CMakeLists.txt
@@ -36,7 +36,7 @@ if(GDAL_FOUND)
monetdb_config_header
mutils
stream
- gdk
+ bat
monetdb5
sqlinclude
$<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.14.0>:GDAL::GDAL>)
diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt
--- a/sql/common/CMakeLists.txt
+++ b/sql/common/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(sqlcommon
monetdb_config_header
matomic
stream
- gdk
+ bat
sqlinclude
sqlstorage)
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -98,7 +98,7 @@ target_link_libraries(sqlserver
PRIVATE
monetdb_config_header
mutils
- gdk
+ bat
sqlcommon
sqlinclude
sqlstorage)
diff --git a/sql/storage/CMakeLists.txt b/sql/storage/CMakeLists.txt
--- a/sql/storage/CMakeLists.txt
+++ b/sql/storage/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(sqlstorage
PRIVATE
monetdb_config_header
mutils
- gdk
+ bat
sqlcommon
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
