MonetDB: cmake-fun - Geom module compiles and installs on Windows.

[Pedro Ferreira]

Changeset: 332ecaa15fa1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=332ecaa15fa1
Modified Files:
        common/utils/CMakeLists.txt
        geom/lib/CMakeLists.txt
        geom/monetdb5/CMakeLists.txt
Branch: cmake-fun
Log Message:

Geom module compiles and installs on Windows.


diffs (50 lines):

diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -18,12 +18,10 @@ if(WIN32)
        install(TARGETS mutils DESTINATION ${LIBDIR})
 
        add_library(mcrypt SHARED ${MCRYPT_OBJECTS})
-       target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
        target_compile_definitions(mcrypt PRIVATE LIBMAPI LIBMCRYPT)
        install(TARGETS mcrypt DESTINATION ${LIBDIR})
 
        add_library(msabaoth SHARED ${MSABAOTH_OBJECTS})
-       target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
        target_compile_definitions(msabaoth PRIVATE LIBMSABAOTH LIBMUUID LIBMAL 
LIBATOMS LIBKERNEL LIBOPTIMIZER LIBSCHEDULER
                                                           LIBMONETDB5)
        install(TARGETS msabaoth DESTINATION ${LIBDIR})
@@ -32,10 +30,11 @@ else()
        set_target_properties(mutils PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
        add_library(mcrypt STATIC ${MCRYPT_OBJECTS})
-       target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
        set_target_properties(mcrypt PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
        add_library(msabaoth STATIC ${MSABAOTH_OBJECTS})
-       target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
        set_target_properties(msabaoth PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
+
+target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
+target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -18,3 +18,5 @@ 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
@@ -12,6 +12,7 @@ include_directories(../lib ../../gdk ../
 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)
 
 install(TARGETS geom_module DESTINATION ${LIBDIR}/monetdb5)
 install(FILES geom.mal DESTINATION ${LIBDIR}/monetdb5)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list