Changeset: c12eaebd9c08 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c12eaebd9c08
Modified Files:
CMakeLists.txt
clients/NT/CMakeLists.txt
cmake/FindUUID.cmake
monetdb5/NT/CMakeLists.txt
sql/NT/CMakeLists.txt
sql/backends/monet5/UDF/pyapi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
Branch: cmake-fun
Log Message:
Windows fixes.
diffs (77 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -679,7 +679,10 @@ if(NOT ${WITH_REGEX} STREQUAL "POSIX")
include(FindPCRE)
if(PCRE_FOUND)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${PCRE_INCLUDE_DIR}")
check_symbol_exists("PCRE_CONFIG_UTF8" "pcre.h" HAVE_LIBPCRE)
#Test for UTF-8 support on PCRE library (PCRE_CONFIG_UTF8 is a macro)
+ cmake_pop_check_state()
if(NOT HAVE_LIBPCRE)
if(${WITH_REGEX} STREQUAL "PCRE")
message(FATAL_ERROR "PCRE library found but no
UTF-8 support")
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -6,4 +6,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-install(FILES mclient.bat msqldump.bat stethoscope.bat DESTINATION ${PREFIX})
+install(FILES mclient.bat msqldump.bat stethoscope.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake
--- a/cmake/FindUUID.cmake
+++ b/cmake/FindUUID.cmake
@@ -18,7 +18,7 @@ endif()
cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${UUID_INCLUDE_DIR}")
set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};${UUID_LIBRARIES}")
-check_symbol_exists("uuid_generate" "uuid/uuid.h" HAVE_UUID_GENERATE)
+check_symbol_exists("uuid_generate" "uuid/uuid.h" HAVE_UUID_GENERATE) # some
uuid instalations don't supply this symbol
cmake_pop_check_state()
if(NOT HAVE_UUID_GENERATE)
set(UUID_FOUND OFF)
diff --git a/monetdb5/NT/CMakeLists.txt b/monetdb5/NT/CMakeLists.txt
--- a/monetdb5/NT/CMakeLists.txt
+++ b/monetdb5/NT/CMakeLists.txt
@@ -6,4 +6,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-install(FILES M5server.bat DESTINATION ${PREFIX})
+install(FILES M5server.bat DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/sql/NT/CMakeLists.txt b/sql/NT/CMakeLists.txt
--- a/sql/NT/CMakeLists.txt
+++ b/sql/NT/CMakeLists.txt
@@ -6,4 +6,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-install(FILES MSQLclient.bat MSQLserver.bat DESTINATION ${PREFIX})
+install(FILES MSQLclient.bat MSQLserver.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
diff --git a/sql/backends/monet5/UDF/pyapi/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi/CMakeLists.txt
@@ -27,7 +27,7 @@ target_compile_definitions(pyapi PRIVATE
install(TARGETS pyapi DESTINATION ${LIBDIR}/monetdb5)
if(WIN32)
install(FILES $<TARGET_PDB_FILE:pyapi> DESTINATION ${LIBDIR}/monetdb5
OPTIONAL)
- install(FILES pyapi_locatepython2.bat DESTINATION ${PREFIX})
+ install(FILES pyapi_locatepython2.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
endif()
install(FILES pyapi.mal DESTINATION ${LIBDIR}/monetdb5)
install(FILES 50_pyapi.mal DESTINATION ${LIBDIR}/monetdb5/autoload)
diff --git a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
@@ -27,7 +27,7 @@ target_compile_definitions(pyapi3 PRIVAT
install(TARGETS pyapi3 DESTINATION ${LIBDIR}/monetdb5)
if(WIN32)
install(FILES $<TARGET_PDB_FILE:pyapi3> DESTINATION ${LIBDIR}/monetdb5
OPTIONAL)
- install(FILES pyapi_locatepython3.bat DESTINATION ${PREFIX})
+ install(FILES pyapi_locatepython3.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
endif()
install(FILES pyapi3.mal DESTINATION ${LIBDIR}/monetdb5)
install(FILES 50_pyapi3.mal DESTINATION ${LIBDIR}/monetdb5/autoload)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
