[cmake] Use execute_process instead of deprecated EXEC_COMMAND

See CMP0153
ticheler · Apr 21, 2024 · 6785fe4 · 6785fe4
1 parent 2121644
commit 6785fe4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -544,7 +544,7 @@ if(WITH_CORE)
   # get the Qt plugins directory
   get_target_property(QMAKE_EXECUTABLE ${QT_VERSION_BASE}::qmake LOCATION)
 
-  EXEC_PROGRAM(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
+  execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS RESULT_VARIABLE return_code OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
   set (QT_PLUGINS_DIR ${DEFAULT_QT_PLUGINS_DIR} CACHE STRING "Path to installation directory for Qt Plugins. Defaults to Qt native plugin directory")
 
   if (BUILD_WITH_QT6)

diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake
@@ -98,9 +98,8 @@ if(NOT GDAL_FOUND)
         IF (GDAL_CONFIG) 
 
           ## extract gdal version 
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --version
-              OUTPUT_VARIABLE GDAL_VERSION )
+          execute_process(COMMAND ${GDAL_CONFIG} --version
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_VERSION )
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GDAL_VERSION_MAJOR "${GDAL_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" GDAL_VERSION_MICRO "${GDAL_VERSION}")
@@ -123,9 +122,8 @@ if(NOT GDAL_FOUND)
           ENDIF( (GDAL_VERSION_MAJOR EQUAL 3) AND (GDAL_VERSION_MINOR EQUAL 0) AND (GDAL_VERSION_MICRO LESS 3) )
 
           # set INCLUDE_DIR to prefix+include
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --prefix
-              OUTPUT_VARIABLE GDAL_PREFIX)
+          execute_process(COMMAND ${GDAL_CONFIG} --prefix
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_PREFIX)
           #SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL)
           FIND_PATH(GDAL_INCLUDE_DIR 
               gdal.h 
@@ -136,9 +134,8 @@ if(NOT GDAL_FOUND)
               )
 
           ## extract link dirs for rpath  
-          EXEC_PROGRAM(${GDAL_CONFIG}
-              ARGS --libs
-              OUTPUT_VARIABLE GDAL_CONFIG_LIBS )
+          execute_process(COMMAND ${GDAL_CONFIG} --libs
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GDAL_CONFIG_LIBS )
 
           ## split off the link dirs (for rpath)
           ## use regular expression to match wildcard equivalent "-L*<endchar>"

diff --git a/cmake/FindGEOS.cmake b/cmake/FindGEOS.cmake
@@ -86,9 +86,8 @@ if(NOT GEOS_FOUND)
 
         IF (GEOS_CONFIG)
 
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --version
-              OUTPUT_VARIABLE GEOS_VERSION)
+          execute_process(COMMAND ${GEOS_CONFIG} --version
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_VERSION)
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
 
@@ -97,9 +96,8 @@ if(NOT GEOS_FOUND)
           ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
 
           # set INCLUDE_DIR to prefix+include
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --prefix
-              OUTPUT_VARIABLE GEOS_PREFIX)
+          execute_process(COMMAND ${GEOS_CONFIG} --prefix
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_PREFIX)
 
           FIND_PATH(GEOS_INCLUDE_DIR
               geos_c.h
@@ -109,9 +107,8 @@ if(NOT GEOS_FOUND)
               )
 
           ## extract link dirs for rpath
-          EXEC_PROGRAM(${GEOS_CONFIG}
-              ARGS --libs
-              OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
+          execute_process(COMMAND ${GEOS_CONFIG} --libs
+              OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
 
           ## split off the link dirs (for rpath)
           ## use regular expression to match wildcard equivalent "-L*<endchar>"

diff --git a/cmake/FindPDAL.cmake b/cmake/FindPDAL.cmake
@@ -76,9 +76,8 @@ ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN)
 
 IF (PDAL_FOUND)
     # extract PDAL version
-    EXEC_PROGRAM(${PDAL_BIN}
-	ARGS --version
-	OUTPUT_VARIABLE PDAL_VERSION_OUT )
+    execute_process(COMMAND ${PDAL_BIN} --version
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PDAL_VERSION_OUT )
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\1" PDAL_VERSION_MAJOR "${PDAL_VERSION_OUT}")
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\2" PDAL_VERSION_MINOR "${PDAL_VERSION_OUT}")
     STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_PATCH "${PDAL_VERSION_OUT}")

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -68,21 +68,18 @@ ELSE(WIN32)
 
     IF (POSTGRES_CONFIG) 
       # set INCLUDE_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --includedir
-        OUTPUT_VARIABLE PG_TMP)
+      execute_process(COMMAND ${POSTGRES_CONFIG} --includedir
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
       SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
 
       # set LIBRARY_DIR
-      EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --libdir
-        OUTPUT_VARIABLE PG_TMP)
+      execute_process(COMMAND ${POSTGRES_CONFIG} --libdir
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
       IF (APPLE)
         SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
       ELSEIF (CYGWIN)
-        EXEC_PROGRAM(${POSTGRES_CONFIG}
-        ARGS --libs
-        OUTPUT_VARIABLE PG_TMP)
+        execute_process(COMMAND ${POSTGRES_CONFIG} --libs
+            OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PG_TMP)
 
         STRING(REGEX MATCHALL "[-][L]([^ ;])+" _LDIRS "${PG_TMP}")
         STRING(REGEX MATCHALL "[-][l]([^ ;])+" _LLIBS "${PG_TMP}")

diff --git a/cmake_templates/cmake_uninstall.cmake.in b/cmake_templates/cmake_uninstall.cmake.in
@@ -7,10 +7,10 @@ STRING(REGEX REPLACE "\n" ";" files "${files}")
 FOREACH(file ${files})
   MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
   IF(EXISTS "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
+    execute_process(
+      COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
       )
     IF("${rm_retval}" STREQUAL 0)
     ELSE("${rm_retval}" STREQUAL 0)