Changeset: b2b733e16030 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2b733e16030
Modified Files:
monetdb5/tools/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (69 lines):
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -17,18 +17,19 @@ file(GLOB MODULES_SRC "../modules/mal/*.
file(GLOB OPTIMIZER_SRC "../optimizer/*.h" "../optimizer/*.c")
file(GLOB SCHEDULER_SRC "../scheduler/*.h" "../scheduler/*.c")
-set(MONETDB5_LINK_LIBRARIES mutils mcrypt msabaoth)
+set(MONETDB5_PRIVATE_LINK_LIBRARIES )
if(WIN32)
- list(APPEND MONETDB5_LINK_LIBRARIES ${UUID_LIBRARIES} ${MATH_LIBRARIES}
${SOCKET_LIBRARIES} ${MALLOC_LIBRARIES}
- ${PTHREAD_LIBRARIES} ${DL_LIBRARIES} ${CRYPTO_LIBRARIES}
${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} gdk stream)
+ list(APPEND MONETDB5_PRIVATE_LINK_LIBRARIES ${UUID_LIBRARIES}
${MATH_LIBRARIES} ${SOCKET_LIBRARIES}
+ ${MALLOC_LIBRARIES} ${PTHREAD_LIBRARIES} ${DL_LIBRARIES}
${CRYPTO_LIBRARIES} ${PCRE_LIBRARIES}
+ ${LIBXML2_LIBRARIES} gdk stream)
if(HAVE_MAPI)
- list(APPEND MONETDB5_LINK_LIBRARIES mapi)
+ list(APPEND MONETDB5_PRIVATE_LINK_LIBRARIES mapi)
endif()
endif()
add_library(monetdb5 SHARED ${MAL_SRC} ${ATOMS_SRC} ${KERNEL_SRC}
${MODULES_SRC} ${OPTIMIZER_SRC} ${SCHEDULER_SRC}
$<$<PLATFORM_ID:Windows>:libmonetdb5.rc>)
-target_link_libraries(monetdb5 PRIVATE ${MONETDB5_LINK_LIBRARIES})
+target_link_libraries(monetdb5 PUBLIC mutils mcrypt msabaoth PRIVATE
${MONETDB5_PRIVATE_LINK_LIBRARIES})
set_target_properties(monetdb5 PROPERTIES VERSION ${MONETDB5_VERSION}
SOVERSION ${MONETDB5_VERSION_MAJOR})
target_compile_definitions(monetdb5 PRIVATE LIBMAL LIBATOMS LIBKERNEL
LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
diff --git a/tools/merovingian/daemon/CMakeLists.txt
b/tools/merovingian/daemon/CMakeLists.txt
--- a/tools/merovingian/daemon/CMakeLists.txt
+++ b/tools/merovingian/daemon/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(.. ../../../common/o
add_executable(monetdbd merovingian.c merovingian.h argvcmds.c argvcmds.h
client.c client.h connections.c connections.h
controlrunner.c controlrunner.h discoveryrunner.c
discoveryrunner.h forkmserver.c forkmserver.h
handlers.c handlers.h multiplex-funnel.c
multiplex-funnel.h proxy.c proxy.h)
-target_link_libraries(monetdbd PRIVATE meroutil mcrypt msabaoth mutils
moptions stream mapi monetdb5 gdk ${UUID_LIBRARIES}
+target_link_libraries(monetdbd PRIVATE meroutil moptions stream mapi monetdb5
gdk ${UUID_LIBRARIES}
${CRYPTO_LIBRARIES}
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${MATH_LIBRARIES}
${MALLOC_LIBRARIES}
${PTHREAD_LIBRARIES} ${DL_LIBRARIES} ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES})
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(. ../../monetdb5/mal
configure_file(monet_version.c.in ${CMAKE_CURRENT_BINARY_DIR}/monet_version.c
@ONLY)
add_executable(mserver5 mserver5.c monet_version.h
${CMAKE_CURRENT_BINARY_DIR}/monet_version.c)
-target_link_libraries(mserver5 PRIVATE monetdb5 gdk stream mapi moptions
mutils ${UUID_LIBRARIES} ${MATH_LIBRARIES}
+target_link_libraries(mserver5 PRIVATE monetdb5 gdk stream mapi moptions
${UUID_LIBRARIES} ${MATH_LIBRARIES}
${SOCKET_LIBRARIES}
${MALLOC_LIBRARIES} ${PTHREAD_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})
@@ -33,11 +33,11 @@ endif()
if(HAVE_TESTING)
add_executable(shutdowntest shutdowntest.c)
- target_link_libraries(shutdowntest PRIVATE monetdb5 gdk stream mapi
moptions mutils ${UUID_LIBRARIES}
- ${MATH_LIBRARIES}
${SOCKET_LIBRARIES} ${MALLOC_LIBRARIES} ${PTHREAD_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})
+ target_link_libraries(shutdowntest PRIVATE monetdb5 gdk stream mapi
moptions ${UUID_LIBRARIES} ${MATH_LIBRARIES}
+ ${SOCKET_LIBRARIES}
${MALLOC_LIBRARIES} ${PTHREAD_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})
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
