[geos-commits] [SCM] GEOS branch 3.12 updated. 02584d8bebf2a889d3a0deb185fd7952f03a502d
git at osgeo.org
git at osgeo.org
Thu Jun 6 12:47:56 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, 3.12 has been updated
via 02584d8bebf2a889d3a0deb185fd7952f03a502d (commit)
from b74fefb7be4ba6c833760106f95f0f495b832c43 (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 02584d8bebf2a889d3a0deb185fd7952f03a502d
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jun 6 12:30:11 2024 -0700
Stop using deprecated exec_program command in cmake, references #1102
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
index 7c6342711..749221415 100644
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
@@ -30,19 +30,23 @@ foreach(file ${files})
message(STATUS "\tTrying to execute remove command anyway.")
endif()
- exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ execute_process(
+ COMMAND "@CMAKE_COMMAND@" -E remove \"$ENV{DESTDIR}${file}\"
OUTPUT_VARIABLE rm_out
- RETURN_VALUE rm_retval)
+ RESULT_VARIABLE rm_retval)
+
if(NOT "${rm_retval}" STREQUAL 0)
message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
endif()
+
endforeach()
message(STATUS "Deleting ${GEOS_INCLUDE_DIR} directory")
-exec_program("@CMAKE_COMMAND@"
- ARGS "-E remove_directory \"${GEOS_INCLUDE_DIR}\""
+execute_process(
+ COMMAND "@CMAKE_COMMAND@" -E remove_directory \"${GEOS_INCLUDE_DIR}\"
OUTPUT_VARIABLE rm_out
- RETURN_VALUE rm_retval)
+ RESULT_VARIABLE rm_retval)
+
if(NOT "${rm_retval}" STREQUAL 0)
message(FATAL_ERROR "Problem when removing \"${GEOS_INCLUDE_DIR}\"")
endif()
-----------------------------------------------------------------------
Summary of changes:
cmake/cmake_uninstall.cmake.in | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list