[geos-commits] [SCM] GEOS branch master updated. d04e0991c64019c7736d7288983e8f583582ba1c

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  d04e0991c64019c7736d7288983e8f583582ba1c (commit)
      from  3af99a815b30eaac61b9bf234c6677c5e41fcf73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d04e0991c64019c7736d7288983e8f583582ba1c
Author: Mateusz Łoskot <mateusz at loskot.net>
Date:   Fri May 24 01:32:36 2019 +0200

    Add GEOS_DLL_EXPORT to compile definitions for MSVC
    
    Required to trigger generation of `.lib` archive with
    import library for DLL.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e31590a..2937297 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,9 @@ add_subdirectory(include)
 add_subdirectory(src)
 
 if(BUILD_SHARED_LIBS)
+  target_compile_definitions(geos
+    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
+
   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION})
   if(NOT WIN32)
     set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_MAJOR})
@@ -202,15 +205,19 @@ endif()
 #-----------------------------------------------------------------------------
 add_library(geos_c "")
 target_link_libraries(geos_c PRIVATE geos)
-add_subdirectory(capi)
 
 if(BUILD_SHARED_LIBS)
+  target_compile_definitions(geos_c
+    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
+
   set_target_properties(geos_c PROPERTIES VERSION ${GEOS_VERSION})
   if(NOT WIN32)
     set_target_properties(geos_c PROPERTIES SOVERSION ${GEOS_VERSION_MAJOR})
   endif()
 endif()
 
+add_subdirectory(capi)
+
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS