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

[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  a71e095d304d13c071e5144f128fe37680e6c47b (commit)
       via  292fe67d954d3e3f5e901459f10a01f84051a992 (commit)
       via  5ceeb1d2918a6f078571190912271cb57e4085d3 (commit)
      from  f453c48a6d6cb0ab023caa74a8260802d16c98ef (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 a71e095d304d13c071e5144f128fe37680e6c47b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Sep 25 11:16:37 2019 -0700

    No symlinks on libgeos, only on libgeos_c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76aeca3..48258ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,9 +106,6 @@ set(CAPI_VERSION_MAJOR ${_version_capi_major})
 set(CAPI_VERSION_MINOR ${_version_capi_age})
 set(CAPI_VERSION_PATCH ${_version_capi_revision})
 set(CAPI_VERSION "${_version_capi_major}.${_version_capi_age}.${_version_capi_revision}")
-if(NOT WIN32)
-  set(CAPI_SOVERSION ${_version_capi_age})
-endif()
 
 unset(_version_capi_current)
 unset(_version_capi_major)
@@ -230,9 +227,7 @@ if(BUILD_SHARED_LIBS)
     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})
-  endif()
+  set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION})
 endif()
 
 #-----------------------------------------------------------------------------
@@ -284,12 +279,21 @@ configure_file(cmake/geos-config.cmake
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
   COPYONLY)
 
-install(TARGETS geos geos_c geos_cxx_flags
+install(TARGETS geos geos_cxx_flags
+  EXPORT geos-targets
+  LIBRARY DESTINATION lib NAMELINK_SKIP
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include
+  )
+
+install(TARGETS geos_c
   EXPORT geos-targets
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
   RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include)
+  INCLUDES DESTINATION include
+  )
 
 install(EXPORT geos-targets
   FILE geos-targets.cmake

commit 292fe67d954d3e3f5e901459f10a01f84051a992
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Sep 25 09:20:05 2019 -0700

    Uncomment the mapping of GEOS_VERSION to VERSION for geos_c.h generation

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 164064c..529869d 100644
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -18,10 +18,12 @@ target_include_directories(geos_c
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     $<INSTALL_INTERFACE:include/geos>)
 
-# set(VERSION ${CAPI_VERSION})
-# set(VERSION_MAJOR ${CAPI_VERSION_MINOR})
-# set(VERSION_MINOR ${CAPI_VERSION_MINOR})
-# set(VERSION_PATCH ${CAPI_VERSION_PATCH})
+# Copy these over so they match the @VARIABLES@ used by autoconf
+# in geos_c.h.in
+set(VERSION ${GEOS_VERSION})
+set(VERSION_MAJOR ${GEOS_VERSION_MAJOR})
+set(VERSION_MINOR ${GEOS_VERSION_MINOR})
+set(VERSION_PATCH ${GEOS_VERSION_PATCH})
 
 configure_file(
   ${CMAKE_CURRENT_LIST_DIR}/geos_c.h.in

commit 5ceeb1d2918a6f078571190912271cb57e4085d3
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Sep 24 19:39:48 2019 -0700

    Harmonize cmake install names with autotools
    Make sure geos_c uses capi version numbers

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 625f51d..76aeca3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ unset(_version_patch)
 unset(_version_patch_word)
 
 message(STATUS "GEOS: Version ${GEOS_VERSION_FULL}")
-message(STATUS "GEOS: C API soversion ${CAPI_SOVERSION}")
+message(STATUS "GEOS: C API Version ${CAPI_VERSION}")
 message(STATUS "GEOS: JTS port ${JTS_PORT}")
 
 #-----------------------------------------------------------------------------
@@ -245,9 +245,9 @@ 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})
+  set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
   if(NOT WIN32)
-    set_target_properties(geos_c PROPERTIES SOVERSION ${GEOS_VERSION_MAJOR})
+    set_target_properties(geos_c PROPERTIES SOVERSION ${CAPI_VERSION_MAJOR})
   endif()
 endif()
 
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index d4bbb00..164064c 100644
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -18,10 +18,10 @@ target_include_directories(geos_c
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     $<INSTALL_INTERFACE:include/geos>)
 
-set(VERSION ${GEOS_VERSION})
-set(VERSION_MAJOR ${GEOS_VERSION_MAJOR})
-set(VERSION_MINOR ${GEOS_VERSION_MINOR})
-set(VERSION_PATCH ${GEOS_VERSION_PATCH})
+# set(VERSION ${CAPI_VERSION})
+# set(VERSION_MAJOR ${CAPI_VERSION_MINOR})
+# set(VERSION_MINOR ${CAPI_VERSION_MINOR})
+# set(VERSION_PATCH ${CAPI_VERSION_PATCH})
 
 configure_file(
   ${CMAKE_CURRENT_LIST_DIR}/geos_c.h.in

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

Summary of changes:
 CMakeLists.txt      | 26 +++++++++++++++-----------
 capi/CMakeLists.txt |  2 ++
 2 files changed, 17 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS