[geos-commits] [SCM] GEOS branch main updated. 758238d1330a164738f868504afe0ce073dd3a31

[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, main has been updated
       via  758238d1330a164738f868504afe0ce073dd3a31 (commit)
      from  e45ab35daa746e0a589d394e8fb76f31a79933f9 (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 758238d1330a164738f868504afe0ce073dd3a31
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Nov 15 14:52:59 2023 -0800

    Go back to ordinary install on Apple MacOS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c522752e..a7b9773f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,10 +301,11 @@ target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE $<BUILD_INTERFACE:ryu>)
 # ryu is an object library, nothing is actually being linked here. The BUILD_INTERFACE
 # switch was necessary to build on AppVeyor (CMake 3.16.2) but not locally (CMake 3.16.3)
 
-if(APPLE AND BUILD_SHARED_LIBS)
-  set_target_properties(geos PROPERTIES
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-endif()
+# Leave install with an RPATH approach to linking
+#if(APPLE AND BUILD_SHARED_LIBS)
+#  set_target_properties(geos PROPERTIES
+#    INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+#endif()
 
 add_subdirectory(include)
 add_subdirectory(src)
@@ -332,10 +333,11 @@ add_library(geos_c "")
 add_library(GEOS::geos_c ALIAS geos_c)
 target_link_libraries(geos_c PRIVATE geos)
 
-if(APPLE AND BUILD_SHARED_LIBS)
-  set_target_properties(geos_c PROPERTIES
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-endif()
+# Leave install with an RPATH approach to linking
+#if(APPLE AND BUILD_SHARED_LIBS)
+#  set_target_properties(geos_c PROPERTIES
+#    INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+#endif()
 
 if(BUILD_SHARED_LIBS)
   target_compile_definitions(geos_c

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

Summary of changes:
 CMakeLists.txt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GEOS