Changeset: ce95f69b75ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce95f69b75ab
Modified Files:
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
Branch: cmake-fun
Log Message:
socket libraries are no longer required for monetdb and monetdbd.
diffs (26 lines):
diff --git a/tools/merovingian/client/CMakeLists.txt
b/tools/merovingian/client/CMakeLists.txt
--- a/tools/merovingian/client/CMakeLists.txt
+++ b/tools/merovingian/client/CMakeLists.txt
@@ -10,8 +10,8 @@ include_directories(../../../common/stre
add_executable(monetdb monetdb.c)
target_link_libraries(monetdb PRIVATE meroutil mcrypt msabaoth mutils stream
${UUID_LIBRARIES} ${CRYPTO_LIBRARIES}
- ${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES}
- ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES})
+ ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
+ ${CURL_LIBRARIES} ${ICONV_LIBRARIES})
install(TARGETS monetdb DESTINATION ${BINDIR})
if(WIN32)
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
@@ -15,7 +15,7 @@ add_executable(monetdbd merovingian.c me
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 moptions stream mapi monetdb5
gdk ${UUID_LIBRARIES}
- ${CRYPTO_LIBRARIES}
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
+ ${CRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${MATH_LIBRARIES}
${THREAD_LIBRARIES} ${DL_LIBRARIES}
${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} ${KVM_LIBRARIES})
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
