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

[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  d9546f690bcf2bb35c197265602731c8f6f8ca48 (commit)
       via  4a6ec06baf8a890c7eb8e454eda371bec114b869 (commit)
      from  4ff201dfd885b00dd3e6cdf38d3a918fbde32a7b (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 d9546f690bcf2bb35c197265602731c8f6f8ca48
Merge: 4ff201d 4a6ec06
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Oct 18 22:30:15 2018 -0700

    Merge branch 'macos-framework' of xzcvczx/geos into master
    
    Move add_dependencies(geos_c geos_revision) up for MacOSX


commit 4a6ec06baf8a890c7eb8e454eda371bec114b869
Author: Simon Wells <simonrwells at gmail.com>
Date:   Fri Oct 19 15:04:25 2018 +1300

    Move add_dependencies to inside the if where add_library is done

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

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

Summary of changes:
 capi/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS