[geos-commits] [SCM] GEOS branch master updated. 5694dec1baa9408493cab4b1a502eabf6916e824

[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  5694dec1baa9408493cab4b1a502eabf6916e824 (commit)
      from  c9542e6211d3e32d63f329e703636a3433009958 (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 5694dec1baa9408493cab4b1a502eabf6916e824
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed May 22 09:11:32 2019 -0700

    First step to fixing geos-config, generate from separate
    input files (cmake and in) to avoid crosstalk
    References #971

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 62393e0..1f27b80 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -12,7 +12,7 @@
 #################################################################################
 
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geos-config.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geos-config.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/geos-config)
 
 
diff --git a/tools/geos-config.in b/tools/geos-config.cmake
similarity index 100%
copy from tools/geos-config.in
copy to tools/geos-config.cmake
diff --git a/tools/geos-config.in b/tools/geos-config.in
index 412ee67..b7638d2 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -1,8 +1,7 @@
 #!/bin/sh
-
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
 
 usage()
 {
@@ -23,11 +22,9 @@ Options:
 EOF
     exit $1
 }
-
 if test $# -eq 0; then
   usage 1 1>&2
 fi
-
 while test $# -gt 0; do
 case "$1" in
     -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -35,34 +32,36 @@ case "$1" in
 esac
 case $1 in
     --prefix)
-      echo @CMAKE_INSTALL_PREFIX@
-      ;;
+    echo @prefix@
+     ;;
     --version)
-      echo @GEOS_VERSION@
-      ;;
+    echo @VERSION@
+     ;;
     --cflags)
-      echo -I at CMAKE_INSTALL_PREFIX@/include
+    echo -I at prefix@/include
       ;;
     --libs)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos- at GEOS_VERSION_MAJOR@
+      # TODO: make an alias for --clibs
+      # see http://trac.osgeo.org/geos/ticket/497
+      echo -L at libdir@ -lgeos- at VERSION_RELEASE@
       ;;
     --clibs)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos_c
+      echo -L at libdir@ -lgeos_c
       ;;
     --cclibs)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos
+      echo -L at libdir@ -lgeos
       ;;
     --static-clibs)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos_c -lgeos -lm
+      echo -L at libdir@ -lgeos_c -lgeos -lm
       ;;
     --static-cclibs)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos -lm
+      echo -L at libdir@ -lgeos -lm
       ;;
     --ldflags)
-      echo -L at CMAKE_INSTALL_PREFIX@/lib -lgeos
+      echo -L at libdir@
       ;;
     --includes)
-      echo @CMAKE_INSTALL_PREFIX@/include
+      echo @prefix@/include
       ;;
     --jtsport)
     echo @JTS_PORT@

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

Summary of changes:
 tools/CMakeLists.txt                        |  2 +-
 tools/{geos-config.in => geos-config.cmake} |  0
 tools/geos-config.in                        | 35 ++++++++++++++---------------
 3 files changed, 18 insertions(+), 19 deletions(-)
 copy tools/{geos-config.in => geos-config.cmake} (100%)


hooks/post-receive
-- 
GEOS