[geos-commits] [SCM] GEOS branch 3.7 updated. 1c72b2e2372d4b7f2875e6841034c54aee1dc984

[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, 3.7 has been updated
       via  1c72b2e2372d4b7f2875e6841034c54aee1dc984 (commit)
      from  0aa1031190752bb666f2be9af0f1c79b5f0693d0 (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 1c72b2e2372d4b7f2875e6841034c54aee1dc984
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jan 28 09:53:23 2019 -0800

    fail with cmake -DGEOS_ENABLE_MACOSX_FRAMEWORK=NO
    Closes #936

diff --git a/NEWS b/NEWS
index f5f959a..5ab05ec 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in 3.7.2
 
 - Bug fixes / improvements
   - Envelope constructor using strtod (#875 Paul Ramsey)
+  - Failure in CMake for OSX Framework (#936 Paul Ramsey)
 
 
 
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index a40fde1..633fff8 100644
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -40,9 +40,10 @@ if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_BUILD_SHARED)
       CLEAN_DIRECT_OUTPUT 1)
   endif()
 
+  add_dependencies(geos_c geos_revision)
+
 endif()
 
-add_dependencies(geos_c geos_revision)
 
 #################################################################################
 # Installation
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e477ed4..7771be2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@
 #
 # This is free software; you can redistribute and/or modify it under
 # the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
+# by the Free Software Foundation.
 # See the COPYING file for more information.
 #
 #################################################################################
@@ -26,16 +26,15 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK)
 
   add_library(GEOS SHARED ${geos_SOURCES} ${geos_c_SOURCES})
 
-  math(EXPR CVERSION "${VERSION_MAJOR} + 1") 
- 	# VERSION = current version, SOVERSION = compatibility version 
+  math(EXPR CVERSION "${VERSION_MAJOR} + 1")
+  # VERSION = current version, SOVERSION = compatibility version
   set_target_properties(GEOS
     PROPERTIES
     CLEAN_DIRECT_OUTPUT 1
     FRAMEWORK 1
-    VERSION "${CVERSION}.${VERSION_MINOR}.${VERSION_PATCH}" 
- 	  SOVERSION ${CVERSION} 
+    VERSION "${CVERSION}.${VERSION_MINOR}.${VERSION_PATCH}"
+    SOVERSION ${CVERSION}
     FRAMEWORK_VERSION ${VERSION_MAJOR}
-    BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
     MACOSX_FRAMEWORK_BUNDLE_VERSION "GEOS ${VERSION}"

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

Summary of changes:
 NEWS                |  1 +
 capi/CMakeLists.txt |  3 ++-
 src/CMakeLists.txt  | 11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS