[geos-commits] [SCM] GEOS branch master updated. 4106be37fe1f9b4f0045df676a2dcbc1ed47ddee

[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  4106be37fe1f9b4f0045df676a2dcbc1ed47ddee (commit)
      from  0ed653317b8a9108c073fdccc2727803ea7b03c1 (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 4106be37fe1f9b4f0045df676a2dcbc1ed47ddee
Author: Mike Taves <mwtoews at gmail.com>
Date:   Mon Nov 16 22:37:30 2020 +1300

    Fix CMake Windows install: keep geos-config.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52f85fe..bbbf153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,20 +281,14 @@ add_subdirectory(doc)
 #-----------------------------------------------------------------------------
 include(CMakePackageConfigHelpers)
 
-set(GEOS_INSTALL_FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake")
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
   VERSION ${GEOS_VERSION}
   COMPATIBILITY AnyNewerVersion)
 
-if(NOT MSVC)
-  configure_file(cmake/geos-config.cmake
-    "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
-    COPYONLY)
-  list(APPEND GEOS_INSTALL_FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake")
-endif()
+configure_file(cmake/geos-config.cmake
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
+  COPYONLY)
 
 install(TARGETS geos geos_cxx_flags
   EXPORT geos-targets
@@ -318,7 +312,8 @@ install(EXPORT geos-targets
   DESTINATION lib/cmake/GEOS)
 
 install(FILES
-  ${GEOS_INSTALL_FILES}
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
   DESTINATION lib/cmake/GEOS)
 install(DIRECTORY
   "${CMAKE_CURRENT_LIST_DIR}/include/geos"

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

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


hooks/post-receive
-- 
GEOS