[geos-commits] [SCM] GEOS branch main updated. 1db7c04d6c0ceafb591f039c0b0b3aead450301c

git at osgeo.org git at osgeo.org
Wed Oct 30 05:00:25 PDT 2024


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  1db7c04d6c0ceafb591f039c0b0b3aead450301c (commit)
       via  1847c69e750a2b039e0213d19e0cfda75d52e58b (commit)
      from  46972ad89a143d01ed3ec9a6c2d91d904a87ab0a (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 1db7c04d6c0ceafb591f039c0b0b3aead450301c
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 30 12:19:30 2024 +0100

    Fix removal of include directories by `make uninstall`
    
    Closes GH-1189

diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
index 7eab12b3f..ece9ae0a6 100644
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
@@ -43,7 +43,7 @@ endforeach()
 
 message(STATUS "Deleting ${GEOS_INCLUDE_DIR} directory")
 execute_process(
-  COMMAND "@CMAKE_COMMAND@" -E remove_directory \"${GEOS_INCLUDE_DIR}\"
+  COMMAND "@CMAKE_COMMAND@" -E remove_directory "${GEOS_INCLUDE_DIR}"
   OUTPUT_VARIABLE rm_out
   RESULT_VARIABLE rm_retval)
 

commit 1847c69e750a2b039e0213d19e0cfda75d52e58b
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 30 08:25:07 2024 +0100

    Fix uninstall Makefile rule
    
    Syntax confirmed by
    https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
    
    Closes GH-1187
    References GH-1102 when it probably broke

diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
index 749221415..7eab12b3f 100644
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
@@ -31,7 +31,7 @@ foreach(file ${files})
   endif()
 
   execute_process(
-    COMMAND "@CMAKE_COMMAND@" -E remove \"$ENV{DESTDIR}${file}\"
+    COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
     OUTPUT_VARIABLE rm_out
     RESULT_VARIABLE rm_retval)
 

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

Summary of changes:
 cmake/cmake_uninstall.cmake.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list