Changeset: 13461cb9f530 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13461cb9f530
Added Files:
clients/NT/CMakeLists.txt
clients/examples/C/CMakeLists.txt
clients/examples/CMakeLists.txt
clients/examples/perl/CMakeLists.txt
clients/examples/php/CMakeLists.txt
monetdb5/NT/CMakeLists.txt
sql/NT/CMakeLists.txt
Modified Files:
CMakeLists.txt
clients/CMakeLists.txt
geom/lib/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/CMakeLists.txt
sql/CMakeLists.txt
Branch: cmake-fun
Log Message:
Installing extra files.
diffs (truncated from 328 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,8 +1255,8 @@ if(NOT VALGRIND_FOUND)
endif()
set(R_HOME "")
-set(R_INCS "")
-set(R_LIBS "")
+set(R_INCLUDE_DIR "")
+set(R_LIBRARIES "")
set(ENABLE_RINTEGRATION "AUTO" CACHE STRING "Enable support for R integration
into MonetDB (default=AUTO)") # Check with HAVE_LIBR
if(NOT ${ENABLE_RINTEGRATION} STREQUAL "NO")
if(${ENABLE_RINTEGRATION} MATCHES "^YES|AUTO$")
@@ -1270,9 +1270,9 @@ if(NOT ${ENABLE_RINTEGRATION} STREQUAL "
exec_program("${R_INTERPRETER}" ARGS "CMD config --cppflags"
OUTPUT_VARIABLE R_CPP_OUTPUT RETURN_VALUE R_CPP_RC)
exec_program("${R_INTERPRETER}" ARGS "CMD config --ldflags"
OUTPUT_VARIABLE R_LD_OUTPUT RETURN_VALUE R_LD_RC)
if(R_HOME_RC EQUAL 0 AND R_CPP_RC EQUAL 0 AND R_LD_RC EQUAL 0)
- MT_clibsToCmake(${R_CPP_OUTPUT} R_INCS)
+ MT_clibsToCmake(${R_CPP_OUTPUT} R_INCLUDE_DIR)
string(REPLACE "-fopenmp" "-fopenmp=libgomp" R_LD_OUTPUT
${R_LD_OUTPUT})
- set(R_LIBS "${R_LD_OUTPUT}")
+ set(R_LIBRARIES "${R_LD_OUTPUT}")
set(HAVE_LIBR ON)
set(RHOME ${R_HOME_OUTPUT})
elseif(${ENABLE_RINTEGRATION} STREQUAL "YES")
@@ -1282,7 +1282,7 @@ if(NOT ${ENABLE_RINTEGRATION} STREQUAL "
endif()
endif()
-function(testPythonIntegration HAVE_NUMPY PY_INCLUDES PY_LIBS PY_VERSION
INTEGRATION_ENABLED INTERPRETER_PATH INTERPRETER_CONFIG)
+function(testPythonIntegration HAVE_NUMPY PY_INCLUDE_DIR PY_LIBRARIES
PY_VERSION INTEGRATION_ENABLED INTERPRETER_PATH INTERPRETER_CONFIG)
if(NOT HAVE_PYTHON${PY_VERSION})
if(${INTEGRATION_ENABLED} STREQUAL "AUTO")
message(WARNING "A valid python${PY_VERSION}
interpreter is required for Python${PY_VERSION} integration")
@@ -1325,8 +1325,8 @@ function(testPythonIntegration HAVE_NUMP
exec_program("${PY_CONFIG_FILE}" ARGS "--ldflags"
OUTPUT_VARIABLE PYTHON_LD_FLAGS RETURN_VALUE PYTHON_LD_RC)
if(PYTHON_HEADERS_RC EQUAL 0 AND PYTHON_HEADERS
STREQUAL "True" AND PYTHON_HEADERS_RC EQUAL 0 AND PYTHON_CPP_RC EQUAL 0 AND
PYTHON_LD_RC EQUAL 0)
set(${HAVE_NUMPY} YES PARENT_SCOPE)
- set(${PY_INCLUDES} "${PYTHON_CPP_FLAGS}"
PARENT_SCOPE)
- set(${PY_LIBS} "${PYTHON_LD_FLAGS}"
PARENT_SCOPE)
+ set(${PY_INCLUDE_DIR} "${PYTHON_CPP_FLAGS}"
PARENT_SCOPE)
+ set(${PY_LIBRARIES} "${PYTHON_LD_FLAGS}"
PARENT_SCOPE)
elseif(${INTEGRATION_ENABLED} STREQUAL "AUTO")
message(WARNING "Python.h not found")
else()
@@ -1344,20 +1344,20 @@ function(testPythonIntegration HAVE_NUMP
endif()
endfunction()
-set(PY2_INCS "")
-set(PY2_LIBS "")
+set(PY2_INCLUDE_DIR "")
+set(PY2_LIBRARIES "")
set(PYTHON2_CONFIG "AUTO" CACHE FILEPATH "python2-config is installed as FILE")
set(ENABLE_PY2INTEGRATION "AUTO" CACHE STRING "Enable support for Python 2
integration into MonetDB (default=AUTO)") # Check with HAVE_LIBPY
if(NOT ${ENABLE_PY2INTEGRATION} STREQUAL "NO")
- testPythonIntegration(HAVE_LIBPY PY2_INCS PY2_LIBS "2"
${ENABLE_PY2INTEGRATION} ${PYTHON2_INTERPRETER} ${PYTHON2_CONFIG})
+ testPythonIntegration(HAVE_LIBPY PY2_INCLUDE_DIR PY2_LIBRARIES "2"
${ENABLE_PY2INTEGRATION} ${PYTHON2_INTERPRETER} ${PYTHON2_CONFIG})
endif()
-set(PY3_INCS "")
-set(PY3_LIBS "")
+set(PY3_INCLUDE_DIR "")
+set(PY3_LIBRARIES "")
set(PYTHON3_CONFIG "AUTO" CACHE FILEPATH "python3-config is installed as FILE")
set(ENABLE_PY3INTEGRATION "AUTO" CACHE STRING "enable support for Python 3
integration into MonetDB (default=AUTO)") # Check with HAVE_LIBPY3
if(NOT ${ENABLE_PY3INTEGRATION} STREQUAL "NO")
- testPythonIntegration(HAVE_LIBPY3 PY3_INCS PY3_LIBS "3"
${ENABLE_PY3INTEGRATION} ${PYTHON3_INTERPRETER} ${PYTHON3_CONFIG})
+ testPythonIntegration(HAVE_LIBPY3 PY3_INCLUDE_DIR PY3_LIBRARIES "3"
${ENABLE_PY3INTEGRATION} ${PYTHON3_INTERPRETER} ${PYTHON3_CONFIG})
endif()
set(ODBC_INCLUDE_DIR "")
@@ -1577,8 +1577,8 @@ if(NOT ${WITH_SAMTOOLS} STREQUAL "NO")
cmake_pop_check_state()
endif()
-set(GEOS_INCS "")
-set(GEOS_LIBS "")
+set(GEOS_INCLUDE_DIR "")
+set(GEOS_LIBRARIES "")
set(WITH_GEOS "AUTO" CACHE PATH "geos library is installed in DIR") # Check
with HAVE_GEOS_LIB
if(NOT ${WITH_GEOS} STREQUAL "NO")
set(GEOS_VERSION_REQUIRED_MIN "3.4.0")
@@ -1593,16 +1593,16 @@ if(NOT ${WITH_GEOS} STREQUAL "NO")
if(GEOS_RC EQUAL 0)
if(GEOS_VERSION VERSION_GREATER_EQUAL
${GEOS_VERSION_REQUIRED_MIN})
- exec_program("${GEOS_EXECUTABLE}" ARGS "--cflags"
OUTPUT_VARIABLE GEOS_INCS RETURN_VALUE GEOS_INCS_RC)
- exec_program("${GEOS_EXECUTABLE}" ARGS "--clibs"
OUTPUT_VARIABLE GEOS_LIBS RETURN_VALUE GEOS_LIBS_RC)
+ exec_program("${GEOS_EXECUTABLE}" ARGS "--cflags"
OUTPUT_VARIABLE GEOS_INCLUDE_DIR RETURN_VALUE GEOS_INCS_RC)
+ exec_program("${GEOS_EXECUTABLE}" ARGS "--clibs"
OUTPUT_VARIABLE GEOS_LIBRARIES RETURN_VALUE GEOS_LIBS_RC)
if(NOT GEOS_LIBS_RC EQUAL 0)
- exec_program("${GEOS_EXECUTABLE}" ARGS "--libs"
OUTPUT_VARIABLE GEOS_LIBS RETURN_VALUE GEOS_LIBS_RC)
+ exec_program("${GEOS_EXECUTABLE}" ARGS "--libs"
OUTPUT_VARIABLE GEOS_LIBRARIES RETURN_VALUE GEOS_LIBS_RC)
if(GEOS_LIBS_RC EQUAL 0)
- string(REPLACE "-lgeos" "-lgeos_c"
GEOS_LIBS ${GEOS_LIBS})
+ string(REPLACE "-lgeos" "-lgeos_c"
GEOS_LIBRARIES ${GEOS_LIBRARIES})
endif()
endif()
if(GEOS_INCS_RC EQUAL 0 AND GEOS_LIBS_RC EQUAL 0)
- MT_clibsToCmake(${GEOS_INCS} GEOS_INCS)
+ MT_clibsToCmake(${GEOS_INCLUDE_DIR}
GEOS_INCLUDE_DIR)
set(HAVE_GEOS_LIB YES)
elseif(${WITH_GEOS} STREQUAL "YES")
message(FATAL_ERROR "could not determine geos
cflags and clibs")
@@ -1698,8 +1698,8 @@ if(NOT HAVE_NETCDF)
set(NETCDF_LIBRARIES "")
endif()
-set(LIBLAS_INCS "")
-set(LIBLAS_LIBS "")
+set(LIBLAS_INCLUDE_DIR "")
+set(LIBLAS_LIBRARIES "")
set(WITH_LIBLAS "AUTO" CACHE PATH "liblas library is installed in DIR") #
Check with HAVE_LIBLAS_LIB
if(NOT ${WITH_LIBLAS} STREQUAL "NO")
set(LIBLAS_VERSION_REQUIRED_MIN "1.8.0")
@@ -1714,13 +1714,13 @@ if(NOT ${WITH_LIBLAS} STREQUAL "NO")
if(LIBLAS_RC EQUAL 0)
if(LIBLAS_VERSION VERSION_GREATER_EQUAL
${LIBLAS_VERSION_REQUIRED_MIN})
- exec_program("${LIBLAS_EXECUTABLE}" ARGS "--includes"
OUTPUT_VARIABLE LIBLAS_INCS RETURN_VALUE LIBLAS_INCS_RC)
- exec_program("${LIBLAS_EXECUTABLE}" ARGS "--libs"
OUTPUT_VARIABLE LIBLAS_LIBS RETURN_VALUE LIBLAS_LIBS_RC)
+ exec_program("${LIBLAS_EXECUTABLE}" ARGS "--includes"
OUTPUT_VARIABLE LIBLAS_INCLUDE_DIR RETURN_VALUE LIBLAS_INCS_RC)
+ exec_program("${LIBLAS_EXECUTABLE}" ARGS "--libs"
OUTPUT_VARIABLE LIBLAS_LIBRARIES RETURN_VALUE LIBLAS_LIBS_RC)
if(LIBLAS_INCS_RC EQUAL 0 AND LIBLAS_LIBS_RC EQUAL 0)
- MT_clibsToCmake(${LIBLAS_INCS} LIBLAS_INCS)
+ MT_clibsToCmake(${LIBLAS_INCLUDE_DIR}
LIBLAS_INCLUDE_DIR)
cmake_push_check_state()
- set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES}${LIBLAS_INCS}") # the regex should add the ;
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES}${LIBLAS_INCLUDE_DIR}") # the regex should add the ;
check_include_file("liblas/capi/liblas.h"
HAVE_LIBLAS_LIB)
cmake_pop_check_state()
if(NOT HAVE_LIBLAS_LIB)
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -12,10 +12,10 @@ if(HAVE_MAPI)
endif()
#[[if(HAVE_ODBC)
add_subdirectory(odbc)
-endif()
+endif()#]]
if(HAVE_MAPI)
add_subdirectory(examples)
endif()
if(WIN32)
add_subdirectory(NT)
-endif()#]]
+endif()
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/NT/CMakeLists.txt
@@ -0,0 +1,9 @@
+#[[
+# 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.
+#]]
+
+install(FILES mclient.bat msqldump.bat stethoscope.bat DESTINATION ${PREFIX})
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/examples/C/CMakeLists.txt
@@ -0,0 +1,25 @@
+#[[
+# 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.
+#]]
+
+include_directories(../../mapilib)
+
+if(HAVE_TESTING)
+ set(COMMON_LIBRARIES mapi stream ${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
+ ${LZ4_LIBRARIES}
${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${CRYPTO_LIBRARIES})
+ add_executable(sample0 sample0.c)
+ target_link_libraries(sample0 PRIVATE ${COMMON_LIBRARIES})
+ add_executable(sample1 sample1.c)
+ target_link_libraries(sample1 PRIVATE ${COMMON_LIBRARIES})
+ add_executable(sample4 sample4.c)
+ target_link_libraries(sample4 PRIVATE ${COMMON_LIBRARIES})
+ add_executable(smack00 smack00.c)
+ target_link_libraries(smack00 PRIVATE ${COMMON_LIBRARIES})
+ add_executable(smack01 smack01.c)
+ target_link_libraries(smack01 PRIVATE ${COMMON_LIBRARIES})
+ install(TARGETS sample0 sample1 sample4 smack00 smack01 DESTINATION
${BINDIR})
+endif()
diff --git a/clients/examples/CMakeLists.txt b/clients/examples/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/examples/CMakeLists.txt
@@ -0,0 +1,11 @@
+#[[
+# 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.
+#]]
+
+add_subdirectory(C)
+add_subdirectory(php)
+add_subdirectory(perl)
diff --git a/clients/examples/perl/CMakeLists.txt
b/clients/examples/perl/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/examples/perl/CMakeLists.txt
@@ -0,0 +1,11 @@
+#[[
+# 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.
+#]]
+
+if(HAVE_TESTING)
+ install(FILES sqlsample.pl malsample.pl PERMISSIONS
${PROGRAM_PERMISSIONS_DEFAULT} DESTINATION ${BINDIR})
+endif()
diff --git a/clients/examples/php/CMakeLists.txt
b/clients/examples/php/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/examples/php/CMakeLists.txt
@@ -0,0 +1,11 @@
+#[[
+# 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.
+#]]
+
+if(HAVE_TESTING)
+ install(FILES sqlsample.php PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${BINDIR})
+endif()
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-include_directories(../../common/options ../../common/stream ../../gdk
${GEOS_INCS} ${PROJ_INCLUDE_DIR})
+include_directories(../../common/options ../../common/stream ../../gdk
${GEOS_INCLUDE_DIR} ${PROJ_INCLUDE_DIR})
add_library(geomobj STATIC libgeom.c libgeom.h)
set_target_properties(geomobj PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -6,11 +6,11 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-include_directories(../lib ../../gdk ../../common/stream ../../common/options
../../monetdb5/mal ${GEOS_INCS}
+include_directories(../lib ../../gdk ../../common/stream ../../common/options
../../monetdb5/mal ${GEOS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR})
add_library(geom MODULE geom.h geom.c geomBulk.c geom_upgrade.c)
-target_link_libraries(geom PRIVATE geomobj gdk stream monetdb5 ${GEOS_LIBS}
${PROJ_LIBRARIES})
+target_link_libraries(geom PRIVATE geomobj gdk stream monetdb5
${GEOS_LIBRARIES} ${PROJ_LIBRARIES})
target_compile_definitions(geom PRIVATE LIBGEOM)
install(TARGETS geom DESTINATION ${LIBDIR}/monetdb5)
diff --git a/monetdb5/CMakeLists.txt b/monetdb5/CMakeLists.txt
--- a/monetdb5/CMakeLists.txt
+++ b/monetdb5/CMakeLists.txt
@@ -12,6 +12,6 @@ add_subdirectory(optimizer)
add_subdirectory(scheduler)
add_subdirectory(tools)
add_subdirectory(extras)
-#if(WIN32)
-# add_subdirectory(NT)
-#endif()
+if(WIN32)
+ add_subdirectory(NT)
+endif()
diff --git a/monetdb5/NT/CMakeLists.txt b/monetdb5/NT/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/monetdb5/NT/CMakeLists.txt
@@ -0,0 +1,9 @@
+#[[
+# 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.
+#]]
+
+install(FILES M5server.bat DESTINATION ${PREFIX})
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
