Changeset: 479ce2a32844 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=479ce2a32844
Modified Files:
clients/odbc/driver/CMakeLists.txt
clients/odbc/winsetup/CMakeLists.txt
common/utils/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (110 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
@@ -8,6 +8,10 @@
include_directories(${ODBC_INCLUDE_DIR})
+add_library(MonetODBC_headers INTERFACE)
+target_include_directories(MonetODBC_headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+
add_library(MonetODBC MODULE
ODBCConvert.c
ODBCDbc.c
@@ -100,10 +104,8 @@ add_library(MonetODBC MODULE
SQLTablePrivileges.c
SQLTables.c
SQLTransact.c driver.rc ODBC.syms)
-target_include_directories(MonetODBC INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-target_link_libraries(MonetODBC PRIVATE mapi stream ${ICONV_LIBRARIES}
${ODBCINST_LIBRARIES} ${CRYPTO_LIBRARIES}
- ${SOCKET_LIBRARIES})
+target_link_libraries(MonetODBC PUBLIC MonetODBC_headers PRIVATE mapi stream
${ICONV_LIBRARIES} ${ODBCINST_LIBRARIES}
+ ${CRYPTO_LIBRARIES}
${SOCKET_LIBRARIES})
target_compile_definitions(MonetODBC PRIVATE LIBMONETODBC)
install(TARGETS MonetODBC DESTINATION ${LIBDIR})
if(WIN32)
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
@@ -9,11 +9,11 @@
include_directories(${ODBC_INCLUDE_DIR})
add_library(MonetODBCs SHARED setup.c setup.rc setup.syms resource.h)
-target_link_libraries(MonetODBCs PRIVATE MonetODBC ${ODBCINST_LIBRARIES})
+target_link_libraries(MonetODBCs PRIVATE MonetODBC_headers
${ODBCINST_LIBRARIES})
install(TARGETS MonetODBCs DESTINATION ${LIBDIR})
add_executable(odbcinstall install.c)
-target_link_libraries(odbcinstall PRIVATE MonetODBC version shlwapi
${ODBC_LIBRARIES} ${ODBCINST_LIBRARIES})
+target_link_libraries(odbcinstall PRIVATE MonetODBC_headers version shlwapi
${ODBC_LIBRARIES} ${ODBCINST_LIBRARIES})
install(TARGETS odbcinstall DESTINATION ${BINDIR})
if(WIN32)
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
target_link_libraries(mutils PUBLIC utils_headers)
target_link_libraries(mcrypt PUBLIC utils_headers PRIVATE
${MCRYPT_LINK_LIBRARIES})
-target_link_libraries(msabaoth PUBLIC utils_headers PRIVATE
${GDK_LINK_LIBRARIES})
+target_link_libraries(msabaoth PUBLIC utils_headers PRIVATE
${MSABAOTH_LINK_LIBRARIES})
add_dependencies(mutils mrevision)
install(FILES matomic.h DESTINATION ${INCLUDEDIR}/monetdb)
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
@@ -14,12 +14,12 @@ add_subdirectory(generator)
add_library(sqlmonet5_headers INTERFACE)
target_include_directories(sqlmonet5_headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
set(SQL_LINK_LIBRARIES utils_headers stream_headers gdk_headers mal_headers
atoms_headers malmodules_headers sql_headers
kernel_headers optimizer_headers
sqlserver store batstore sqlcommon)
if(WIN32)
- list(APPEND SQL_LINK_LIBRARIES mapi monetdb5 gdk stream
${CRYPTO_LIBRARIES})
+ list(APPEND SQL_LINK_LIBRARIES mcrypt msabaoth stream mapi gdk monetdb5
${CRYPTO_LIBRARIES})
endif()
add_library(sql MODULE
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -17,10 +17,11 @@ configure_file(monet_version.c.in ${CMAK
add_executable(mserver5 mserver5.c monet_version.h
${CMAKE_CURRENT_BINARY_DIR}/monet_version.c)
target_link_libraries(mserver5 PRIVATE utils_headers sqlmonet5_headers
sql_headers sqlcommon_headers store_headers
- sqlserver_headers monetdb5 gdk stream
mapi moptions ${UUID_LIBRARIES} ${MATH_LIBRARIES}
- ${SOCKET_LIBRARIES}
${THREAD_LIBRARIES} ${DL_LIBRARIES} ${CRYPTO_LIBRARIES} ${PCRE_LIBRARIES}
- ${LIBXML2_LIBRARIES}
${PSAPI_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
- ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${KVM_LIBRARIES})
+ sqlserver_headers msabaoth moptions
mutils stream mapi gdk monetdb5 ${UUID_LIBRARIES}
+ ${MATH_LIBRARIES} ${SOCKET_LIBRARIES}
${THREAD_LIBRARIES} ${DL_LIBRARIES} ${CRYPTO_LIBRARIES}
+ ${PCRE_LIBRARIES}
${LIBXML2_LIBRARIES} ${PSAPI_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES}
+ ${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES}
${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES} ${ICONV_LIBRARIES}
+ ${KVM_LIBRARIES})
install(TARGETS mserver5 DESTINATION ${BINDIR})
install(FILES tomographintro.docx tomographintro.pdf DESTINATION
${DATADIR}/doc/MonetDB-client-tools)
@@ -36,11 +37,11 @@ endif()
if(HAVE_TESTING)
add_executable(shutdowntest shutdowntest.c)
target_link_libraries(shutdowntest PRIVATE utils_headers
sqlmonet5_headers sql_headers sqlserver_headers
- sqlcommon_headers
store_headers monetdb5 gdk stream mapi moptions ${UUID_LIBRARIES}
- ${MATH_LIBRARIES}
${SOCKET_LIBRARIES} ${THREAD_LIBRARIES} ${DL_LIBRARIES} ${CRYPTO_LIBRARIES}
- ${PCRE_LIBRARIES}
${LIBXML2_LIBRARIES} ${PSAPI_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES}
- ${SNAPPY_LIBRARIES}
${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES} ${ICONV_LIBRARIES}
- ${KVM_LIBRARIES})
+ sqlcommon_headers
store_headers msabaoth mutils moptions stream mapi gdk monetdb5
+ ${UUID_LIBRARIES}
${MATH_LIBRARIES} ${SOCKET_LIBRARIES} ${THREAD_LIBRARIES} ${DL_LIBRARIES}
+ ${CRYPTO_LIBRARIES}
${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} ${PSAPI_LIBRARIES}
+ ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
+ ${CURL_LIBRARIES}
${ICONV_LIBRARIES} ${KVM_LIBRARIES})
install(TARGETS shutdowntest DESTINATION ${BINDIR})
if(WIN32)
install(FILES $<TARGET_PDB_FILE:shutdowntest> DESTINATION
${BINDIR} OPTIONAL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
