Changeset: ba8cbe863d7e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba8cbe863d7e
Modified Files:
clients/odbc/driver/CMakeLists.txt
clients/odbc/setup/CMakeLists.txt
clients/odbc/winsetup/CMakeLists.txt
Branch: Oct2020
Log Message:
The ODBC libraries are modules.
diffs (72 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
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBC
- SHARED)
+ MODULE)
target_sources(MonetODBC
PRIVATE
@@ -114,7 +114,7 @@ target_include_directories(MonetODBC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
target_compile_definitions(MonetODBC
- PRIVATE
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBC
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -7,11 +7,11 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
- drvcfg.c
+ drvcfg.c
drvcfg.h)
target_include_directories(MonetODBCs
@@ -21,8 +21,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
@@ -23,8 +23,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list