[geos-commits] [SCM] GEOS branch main updated. 7c00a972517362d29c57396bcbc3afed0beb3846

[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  7c00a972517362d29c57396bcbc3afed0beb3846 (commit)
       via  476bcc5dce3740e9fec87c0bfee0e716c1964a44 (commit)
       via  9172812ddcd35f7ed96621ac2ef0eba534f01921 (commit)
       via  ad9e17759de89c2c06e16aabe191c87739f0a12e (commit)
      from  79f75266db60f5c69f5ae48ebc8680b2b26c9f01 (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 7c00a972517362d29c57396bcbc3afed0beb3846
Merge: 476bcc5 79f7526
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 30 12:45:37 2021 -0700

    Merge branch 'main' of https://git.osgeo.org/gitea/geos/geos into main


commit 476bcc5dce3740e9fec87c0bfee0e716c1964a44
Merge: beb9207 9172812
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 30 12:45:27 2021 -0700

    Merge branch 'mwtoews-geosop-install' into main


commit 9172812ddcd35f7ed96621ac2ef0eba534f01921
Merge: beb9207 ad9e177
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 30 08:46:04 2021 -0700

    Merge branch 'geosop-install' of https://github.com/mwtoews/geos into mwtoews-geosop-install


commit ad9e17759de89c2c06e16aabe191c87739f0a12e
Author: Mike Taves <mwtoews at gmail.com>
Date:   Tue Jul 6 09:20:29 2021 +1200

    Install geosop using option BUILD_GEOSOP

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e99aa0a..5f92e84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 message(STATUS "GEOS: Run-time output: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 message(STATUS "GEOS: Archives output: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+
 #-----------------------------------------------------------------------------
 # Version
 #-----------------------------------------------------------------------------
@@ -314,8 +317,6 @@ add_subdirectory(doc)
 #-----------------------------------------------------------------------------
 # Install and export targets - support 'make install' or equivalent
 #-----------------------------------------------------------------------------
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
 
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index bfb345c..8a3880b 100644
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -9,4 +9,9 @@
 # See the COPYING file for more information.
 ################################################################################
 
-add_subdirectory(geosop)
+option(BUILD_GEOSOP "Build geosop command-line interface" ON)
+
+message(STATUS "GEOS: Build geosop ${BUILD_GEOSOP}")
+if(BUILD_GEOSOP)
+  add_subdirectory(geosop)
+endif()
diff --git a/util/geosop/CMakeLists.txt b/util/geosop/CMakeLists.txt
index 45ecd2c..bc31cc8 100644
--- a/util/geosop/CMakeLists.txt
+++ b/util/geosop/CMakeLists.txt
@@ -16,3 +16,7 @@ add_executable(geosop
   WKTStreamReader.cpp )
 
 target_link_libraries(geosop PRIVATE geos geos_c)
+
+install(TARGETS geosop
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

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

Summary of changes:
 CMakeLists.txt             | 5 +++--
 util/CMakeLists.txt        | 7 ++++++-
 util/geosop/CMakeLists.txt | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS