[geos-commits] [SCM] GEOS branch master updated. 43051eb13b87803feb7d33ee9ccde888ff2f20c1

git at osgeo.org git at osgeo.org
Mon Mar 30 07:38:09 PDT 2020


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  43051eb13b87803feb7d33ee9ccde888ff2f20c1 (commit)
      from  4e9a2550a346d2052c5018909dc77eed30117772 (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 43051eb13b87803feb7d33ee9ccde888ff2f20c1
Author: SpaceIm <30052553+SpaceIm at users.noreply.github.com>
Date:   Mon Mar 30 09:37:16 2020 +0200

    fix multiple definitions with MinGW
    
    Avoid multiple definitions if shared and inline with MinGW

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d4596..f0f24ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,7 +224,7 @@ add_subdirectory(src)
 
 if(BUILD_SHARED_LIBS)
   target_compile_definitions(geos
-    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
+    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
 
   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION})
   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION})
@@ -238,7 +238,7 @@ target_link_libraries(geos_c PRIVATE geos)
 
 if(BUILD_SHARED_LIBS)
   target_compile_definitions(geos_c
-    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
+    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
 
   set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
   if(NOT WIN32)

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

Summary of changes:
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list