[geos-commits] [SCM] GEOS branch master updated. 40e21143e2309fc5ba524d535f02c9078b232ed9

[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  40e21143e2309fc5ba524d535f02c9078b232ed9 (commit)
      from  c263a0f712917fc523a3d30e00143bd0835ee744 (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 40e21143e2309fc5ba524d535f02c9078b232ed9
Author: Mike Taves <mwtoews at gmail.com>
Date:   Thu Feb 20 09:21:45 2020 +1300

    Restore #!/bin/sh for geos-config.cmake; escape prefix via CMake

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b30428f..93d9c77 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -13,6 +13,8 @@
 
 
 if(NOT MSVC)
+  # Consider CMAKE_INSTALL_PREFIX with spaces
+  string(REPLACE " " "\\ " ESCAPED_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/geos-config.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/geos-config
diff --git a/tools/geos-config.cmake b/tools/geos-config.cmake
index abef1e3..6730e21 100644
--- a/tools/geos-config.cmake
+++ b/tools/geos-config.cmake
@@ -1,7 +1,6 @@
-#!/bin/bash -e
+#!/bin/sh
 
-# escape path
-prefix=$(printf %q "@CMAKE_INSTALL_PREFIX@")
+prefix=@ESCAPED_INSTALL_PREFIX@
 libdir=${prefix}/lib
 
 usage()

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

Summary of changes:
 tools/CMakeLists.txt    | 2 ++
 tools/geos-config.cmake | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS