Changeset: a29d28aa4dd7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a29d28aa4dd7
Removed Files:
geom/lib/CMakeLists.txt
Modified Files:
geom/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
Branch: cmake-fun
Log Message:
Simplify compilation.
diffs (61 lines):
diff --git a/geom/CMakeLists.txt b/geom/CMakeLists.txt
--- a/geom/CMakeLists.txt
+++ b/geom/CMakeLists.txt
@@ -6,8 +6,9 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-add_subdirectory(lib)
if(HAVE_MONETDB5)
add_subdirectory(monetdb5)
endif()
-add_subdirectory(sql)
+if(HAVE_SQL)
+ add_subdirectory(sql)
+endif()
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
deleted file mode 100644
--- a/geom/lib/CMakeLists.txt
+++ /dev/null
@@ -1,22 +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.
-#]]
-
-include_directories(../../common/options ../../common/stream ../../gdk
${GEOS_INCLUDE_DIR} ${PROJ_INCLUDE_DIR})
-
-set(GEOM_OBJECTS libgeom.c libgeom.h)
-
-if(WIN32)
- add_library(geom SHARED ${GEOM_OBJECTS})
- target_compile_definitions(geom PRIVATE LIBGEOM)
- install(TARGETS geom DESTINATION ${LIBDIR})
-else()
- add_library(geom STATIC ${GEOM_OBJECTS})
- set_target_properties(geom PROPERTIES POSITION_INDEPENDENT_CODE ON)
-endif()
-
-target_link_libraries(geom PRIVATE gdk ${GEOS_LIBRARIES} ${PROJ_LIBRARIES})
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -9,11 +9,10 @@
include_directories(../lib ../../gdk ../../common/stream ../../common/options
../../monetdb5/mal ${GEOS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR})
-add_library(geom_module MODULE geom.h geom.c geomBulk.c geom_upgrade.c)
-target_link_libraries(geom_module PRIVATE geom gdk stream monetdb5
${GEOS_LIBRARIES} ${PROJ_LIBRARIES})
-set_target_properties(geom_module PROPERTIES OUTPUT_NAME geom)
-target_compile_definitions(geom_module PRIVATE LIBGEOM)
+add_library(geom MODULE geom.h geom.c geomBulk.c geom_upgrade.c
../lib/libgeom.c ../lib/libgeom.h)
+target_link_libraries(geom PRIVATE gdk stream monetdb5 ${GEOS_LIBRARIES}
${PROJ_LIBRARIES})
+target_compile_definitions(geom PRIVATE LIBGEOM)
-install(TARGETS geom_module DESTINATION ${LIBDIR}/monetdb5)
+install(TARGETS geom DESTINATION ${LIBDIR}/monetdb5)
install(FILES geom.mal DESTINATION ${LIBDIR}/monetdb5)
install(FILES 30_geom.mal DESTINATION ${LIBDIR}/monetdb5/autoload)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
