Changeset: 548ab7923877 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/548ab7923877
Modified Files:
clients/odbc/driver/CMakeLists.txt
common/utils/CMakeLists.txt
common/utils/mcrypt.h
common/utils/muuid.h
ctest/monetdb5/mal/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/modules/mal/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/pyapi3/pyheader.h
sql/backends/monet5/UDF/udf/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/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: default
Log Message:
Clean up some library mess.
mutils is part of GDK and MAPI, so don't include it separately if either
one is included already.
mcrypt is part of MAPI, so don't include it separately if MAPI is
included already.
diffs (truncated from 370 to 300 lines):
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -127,7 +127,6 @@ target_include_directories(MonetODBC
target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
- mutils
mapi
mutf8
${ODBCINST_LIBRARIES})
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -32,10 +32,7 @@ target_link_libraries(mutils
mutf8)
target_compile_definitions(mutils PRIVATE
- LIBMUTILS
- LIBGDK
- LIBMAPI
- LIBMEROUTIL)
+ LIBMUTILS)
set_target_properties(mutils
PROPERTIES
@@ -74,8 +71,6 @@ target_link_libraries(mcrypt
target_compile_definitions(mcrypt
PRIVATE
- LIBMONETDB5
- LIBMAPI
LIBMCRYPT)
set_target_properties(mcrypt
@@ -108,8 +103,7 @@ target_link_libraries(msabaoth
target_compile_definitions(msabaoth
PRIVATE
- LIBMSABAOTH
- LIBMONETDB5)
+ LIBMSABAOTH)
set_target_properties(msabaoth
PROPERTIES
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -14,7 +14,7 @@
#define _SEEN_MCRYPT_H 1
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMAPI) && !defined(LIBMCRYPT) && !defined(LIBMONETDB5)
+#if !defined(LIBMAPI) && !defined(LIBMCRYPT)
#define mcrypt_export extern __declspec(dllimport)
#else
#define mcrypt_export extern __declspec(dllexport)
diff --git a/common/utils/muuid.h b/common/utils/muuid.h
--- a/common/utils/muuid.h
+++ b/common/utils/muuid.h
@@ -17,13 +17,14 @@
* msabaoth is part of monetdb5 and we want this function to be
* exported so that the call in sql can be satisfied by the version
* that is included in monetdb5 */
-extern
#ifdef WIN32
-#if !defined(LIBMSABAOTH) && !defined(LIBMUUID)
+#if !defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
__declspec(dllimport)
#else
__declspec(dllexport)
#endif
+#else
+extern
#endif
char *generateUUID(void);
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
@@ -17,7 +17,6 @@ target_link_libraries(test_malEmbeddedBo
mal
mcrypt
msabaoth
- mutils
stream
bat
${CMAKE_DL_LIBS}
@@ -32,7 +31,6 @@ target_link_libraries(test_malInclude
mal
mcrypt
msabaoth
- mutils
stream
bat
${CMAKE_DL_LIBS}
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -28,7 +28,6 @@ if(GEOS_FOUND)
target_link_libraries(geomlib
PRIVATE
- mutils
stream
bat
monetdb_config_header
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -50,7 +50,6 @@ if(GEOS_FOUND)
target_link_libraries(geomodule
PRIVATE
- mutils
stream
bat
geomlib
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
@@ -26,7 +26,6 @@ target_include_directories(opt_sql_appen
target_link_libraries(opt_sql_append
PRIVATE
monetdb_config_header
- mutils
bat
monetdb5)
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
@@ -33,7 +33,6 @@ if(LIBR_FOUND)
target_link_libraries(rapi
PRIVATE
monetdb_config_header
- mutils
bat
monetdb5
sqlinclude
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -81,7 +81,6 @@ target_link_libraries(mal
monetdb_config_header
mcrypt
msabaoth
- mutils
stream
mapi
bat)
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
@@ -41,7 +41,6 @@ target_link_libraries(atoms
$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>
stream
monetdb_config_header
- mutils
mutf8
bat
mal)
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
@@ -51,7 +51,6 @@ target_link_libraries(kernel
PRIVATE
$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>
monetdb_config_header
- mutils
bat
mal
atoms)
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -59,7 +59,6 @@ target_compile_definitions(malmodules
target_link_libraries(malmodules
PRIVATE
- mutils
mutf8
$<$<BOOL:${PCRE_FOUND}>:PCRE::PCRE>
mapi
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -19,8 +19,6 @@ add_library(monetdb5 SHARED
target_link_libraries(monetdb5
PRIVATE
- mutils
- mcrypt
stream
mapi
msabaoth
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
@@ -183,7 +183,6 @@ target_include_directories(sql
target_link_libraries(sql
PRIVATE
monetdb_config_header
- mcrypt
sqlstorage
sqlcommon
batstore
@@ -191,6 +190,7 @@ target_link_libraries(sql
sqlinclude
copybinary
monetdb5
+ mapi
bat)
set_target_properties(sql
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
@@ -34,7 +34,6 @@ if(CINTEGRATION)
target_link_libraries(capi
PRIVATE
- mutils
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
@@ -55,7 +55,6 @@ if(HAVE_LIBPY3)
Python3::Python
$<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.14.0>:Python3::NumPy>
sql
- mutils
bat
monetdb5
monetdb_config_header)
diff --git a/sql/backends/monet5/UDF/pyapi3/pyheader.h
b/sql/backends/monet5/UDF/pyapi3/pyheader.h
--- a/sql/backends/monet5/UDF/pyapi3/pyheader.h
+++ b/sql/backends/monet5/UDF/pyapi3/pyheader.h
@@ -61,7 +61,7 @@
// DLL Export Flags
#ifdef WIN32
-#if !defined(LIBPYAPI) && !defined(LIBPYAPI3)
+#ifndef LIBPYAPI3
#define pyapi_export extern __declspec(dllimport)
#else
#define pyapi_export extern __declspec(dllexport)
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
@@ -46,7 +46,6 @@ target_include_directories(udf
target_link_libraries(udf
PRIVATE
- mutils
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
@@ -52,7 +52,6 @@ if(HAVE_FITS)
target_link_libraries(fits
PRIVATE
monetdb_config_header
- mutils
bat
monetdb5
sqlinclude
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
@@ -44,7 +44,6 @@ if(NETCDF_FOUND)
target_link_libraries(netcdff
PRIVATE
monetdb_config_header
- mutils
bat
monetdb5
sqlinclude
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
@@ -43,7 +43,6 @@ if(GDAL_FOUND)
target_link_libraries(shp
PRIVATE
monetdb_config_header
- mutils
bat
monetdb5
sqlinclude
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -113,7 +113,6 @@ target_include_directories(sqlserver
target_link_libraries(sqlserver
PRIVATE
monetdb_config_header
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
