Changeset: 0f4250f29881 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f4250f29881
Removed Files:
geom/lib/Makefile.ag
Modified Files:
geom/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
Branch: cmake-fun
Log Message:
Install geom module SQL files only if the module is available.
Cmake 3.5 was confused with cheader.h file location, maybe because of the
special target.
diffs (43 lines):
diff --git a/geom/CMakeLists.txt b/geom/CMakeLists.txt
--- a/geom/CMakeLists.txt
+++ b/geom/CMakeLists.txt
@@ -7,6 +7,6 @@
#]]
add_subdirectory(monetdb5)
-if(HAVE_SQL)
+if(HAVE_SQL AND HAVE_GEOM)
add_subdirectory(sql)
endif()
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
deleted file mode 100644
--- a/geom/lib/Makefile.ag
+++ /dev/null
@@ -1,14 +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.
-
-MTSAFE
-INCLUDES = ../../common/stream ../../common/utils ../../gdk $(GEOS_INCS)
$(proj_CFLAGS)
-
-lib_geom = {
- NOINST
- DIR = libdir/MonetDB
- SOURCES = ../monetdb5/libgeom.c ../monetdb5/libgeom.h
-}
diff --git a/sql/backends/monet5/UDF/capi/CMakeLists.txt
b/sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt
@@ -27,7 +27,8 @@ if(NOT "${ENABLE_CINTEGRATION}" STREQUAL
list(APPEND CAPI_LINK_LIBRARIES monetdb5 gdk)
endif()
- add_library(capi MODULE capi.c capi.h cheader.h
${CMAKE_CURRENT_BINARY_DIR}/cheader.text.h)
+ add_library(capi MODULE capi.c capi.h
${CMAKE_CURRENT_SOURCE_DIR}/cheader.h
+ ${CMAKE_CURRENT_BINARY_DIR}/cheader.text.h)
target_link_libraries(capi PRIVATE ${CAPI_LINK_LIBRARIES})
set_target_properties(capi PROPERTIES OUTPUT_NAME _capi)
target_compile_definitions(capi PRIVATE LIBCUDF)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
