Changeset: 184afc208874 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=184afc208874
Modified Files:
CMakeLists.txt
monetdb5/tools/CMakeLists.txt
sql/backends/monet5/generator/CMakeLists.txt
testing/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (81 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -705,9 +705,9 @@ else()
set(HAVE_PYTHON3 NO)
endif()
-if(HAVE_PYTHON2)
+if(HAVE_PYTHON2 AND PYTHON2_LIBDIR)
set(PYTHON_LIBDIR ${PYTHON2_LIBDIR})
-elseif(HAVE_PYTHON3)
+elseif(HAVE_PYTHON3 AND PYTHON3_LIBDIR)
set(PYTHON_LIBDIR ${PYTHON3_LIBDIR})
endif()
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -14,7 +14,8 @@ endif()
add_library(monetdb5 SHARED monetdb.c)
target_link_libraries(monetdb5 PRIVATE ${UUID_LIBRARIES} ${MATH_LIBRARIES}
${SOCKET_LIBRARIES} ${MALLOC_LIBRARIES}
${PTHREAD_LIBRARIES} ${DL_LIBRARIES}
${CRYPTO_LIBRARIES} ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES}
- ${MONETDB5_PRIVATE_LINK_OBJECTS}
PUBLIC mal atoms kernel malmodules optimizer scheduler msabaoth)
+ ${MONETDB5_PRIVATE_LINK_OBJECTS}
PUBLIC mal atoms kernel malmodules optimizer scheduler mutils
+ mcrypt msabaoth)
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/sql/backends/monet5/generator/CMakeLists.txt
b/sql/backends/monet5/generator/CMakeLists.txt
--- a/sql/backends/monet5/generator/CMakeLists.txt
+++ b/sql/backends/monet5/generator/CMakeLists.txt
@@ -11,8 +11,7 @@ include_directories(../../../include ../
../../../../monetdb5/optimizer
../../../../monetdb5/scheduler ../../../../common/options
../../../../common/stream
../../../../common/utils ../../../../gdk)
-
-add_library(generator MODULE generator.c generator.h)
+add_library(generator MODULE generator.c generator.h)
target_link_libraries(generator PRIVATE monetdb5 gdk)
set_target_properties(generator PROPERTIES RUNTIME_OUTPUT_NAME _generator
LIBRARY_OUTPUT_NAME _generator)
target_compile_definitions(generator PRIVATE LIBGENERATOR)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -62,9 +62,11 @@ configure_file(monet_options.py.in ${CMA
configure_file(listexports.py.in ${CMAKE_CURRENT_BINARY_DIR}/listexports.py
@ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Mtest.py PERMISSIONS
${PROGRAM_PERMISSIONS_DEFAULT} DESTINATION ${BINDIR})
-install(FILES Mfilter.py process.py
${CMAKE_CURRENT_BINARY_DIR}/monet_options.py __init__.py
- ${CMAKE_CURRENT_BINARY_DIR}/listexports.py exportutils.py
malcheck.py
- DESTINATION
${CMAKE_INSTALL_PREFIX}${PYTHON_LIBDIR}/MonetDBtesting)
+if(PYTHON_LIBDIR)
+ install(FILES Mfilter.py process.py
${CMAKE_CURRENT_BINARY_DIR}/monet_options.py __init__.py
+ ${CMAKE_CURRENT_BINARY_DIR}/listexports.py
exportutils.py malcheck.py
+ DESTINATION
${CMAKE_INSTALL_PREFIX}${PYTHON_LIBDIR}/MonetDBtesting)
+endif()
if(WIN32)
install(FILES Mlog.bat Mtest.py.bat DESTINATION ${BINDIR})
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,8 @@ 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 mal gdk stream mapi
${UUID_LIBRARIES} ${MATH_LIBRARIES} ${SOCKET_LIBRARIES}
+target_link_libraries(mserver5 PRIVATE monetdb5 mal 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})
@@ -31,7 +32,7 @@ endif()
if(HAVE_TESTING)
add_executable(shutdowntest shutdowntest.c)
- target_link_libraries(shutdowntest PRIVATE monetdb5 mal gdk stream mapi
${UUID_LIBRARIES} ${MATH_LIBRARIES}
+ target_link_libraries(shutdowntest PRIVATE monetdb5 mal 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}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
