Changeset: 0f75980d70fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f75980d70fe
Removed Files:
monetdb5/tools/monetdb.c
Modified Files:
monetdb5/tools/CMakeLists.txt
Branch: cmake-fun
Log Message:
Fixed libmonetdb5 compilation.
diffs (49 lines):
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -6,23 +6,17 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-set(MONETDB5_DEPENDENCIES atoms kernel malmodules optimizer scheduler msabaoth
msabaoth bat stream)
-set(MONETDB5_LINK_LIBRARIES atoms kernel malmodules optimizer scheduler
msabaoth msabaoth bat stream ${UUID_LIBRARIES}
- ${MATH_LIBS} ${SOCKET_LIBRARIES} ${MALLOC_LIBS} ${PTHREAD_LIBRARIES}
${CMAKE_DL_LIBS} ${OPENSSL_LIBRARIES}
- ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES})
+set(MONETDB5_PRIVATE_LINK_OBJECTS gdk stream)
if(HAVE_MAPI)
- list(APPEND MONETDB5_DEPENDENCIES mapi)
- list(APPEND MONETDB5_LINK_LIBRARIES mapi)
-endif()
-if(WIN32)
- list(APPEND MONETDB5_DEPENDENCIES strptime)
- list(APPEND MONETDB5_LINK_LIBRARIES strptime)
+ list(APPEND MONETDB5_PRIVATE_LINK_OBJECTS mapi)
endif()
-add_library(monetdb5 SHARED monetdb.c)
-add_dependencies(monetdb5 ${MONETDB5_DEPENDENCIES})
-target_link_libraries(monetdb5 ${MONETDB5_LINK_LIBRARIES})
+add_library(monetdb5 SHARED)
+target_link_libraries(monetdb5 PRIVATE ${UUID_LIBRARIES} ${MATH_LIBS}
${SOCKET_LIBRARIES} ${MALLOC_LIBS}
+ ${PTHREAD_LIBRARIES} ${CMAKE_DL_LIBS}
${OPENSSL_LIBRARIES} ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES}
+ ${MONETDB5_PRIVATE_LINK_OBJECTS}
PUBLIC mal atoms kernel malmodules optimizer scheduler msabaoth)
set_target_properties(monetdb5 PROPERTIES VERSION ${MONETDB5_VERSION}
SOVERSION ${MONETDB5_VERSION_MAJOR})
+
install(TARGETS monetdb5 DESTINATION ${LIBDIR})
if(NOT WIN32)
diff --git a/monetdb5/tools/monetdb.c b/monetdb5/tools/monetdb.c
deleted file mode 100644
--- a/monetdb5/tools/monetdb.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
- */
-
-/* cmake requires at least one source file to build a library without a dirty
hack, so this file was added for that
- * purpose */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
