Merge pull request MapServer#7057 from rouault/remove_exec_program

CMake and CI adjustments

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0...3.23)
+cmake_minimum_required(VERSION 3.0...3.29)
 
 project (MapServer)
 

ci/build.sh

@@ -12,10 +12,13 @@ if [ "${MAPSCRIPT_PYTHON_ONLY:-}" = "true" ]; then
     exit
 fi
 
+# Turn CMake warnings as errors
+EXTRA_CMAKEFLAGS="-Werror=dev"
+
 if [ "${WITH_ASAN:-}" = "true" ]; then
     # -DNDEBUG to avoid issues with cairo cleanup
     make cmakebuild MFLAGS="-j$(nproc)" CMAKE_C_FLAGS="-g -fsanitize=address -DNDEBUG" CMAKE_CXX_FLAGS="-g -fsanitize=address -DNDEBUG" \
-    EXTRA_CMAKEFLAGS="-DCMAKE_BUILD_TYPE=None -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address"
+    EXTRA_CMAKEFLAGS="${EXTRA_CMAKEFLAGS} -DCMAKE_BUILD_TYPE=None -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address"
 else
     make cmakebuild MFLAGS="-j$(nproc)" CMAKE_C_FLAGS="-O2" CMAKE_CXX_FLAGS="-O2" LIBMAPSERVER_EXTRA_FLAGS="-Wall -Werror -Wextra"
     make mspython-wheel

cmake/FindGDAL.cmake

@@ -73,7 +73,7 @@ if(UNIX)
     )
 
     if(GDAL_CONFIG)
-        exec_program(${GDAL_CONFIG} ARGS --libs OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
+        execute_process(COMMAND ${GDAL_CONFIG} --libs OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
         if(GDAL_CONFIG_LIBS)
             string(REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
             string(REGEX REPLACE "-l" "" _gdal_lib "${_gdal_dashl}")

src/mapscript/csharp/run_test.sh

@@ -1,12 +1,12 @@
 #!/bin/sh -ex
 cd ${CSHARP_MAPSCRIPT_SO}
 echo .: Testing shpdump.exe :.
-mono shpdump.exe ../../../../tests/point.shp
+LC_ALL=C mono shpdump.exe ../../../../tests/point.shp
 echo .: Testing drawmap.exe :.
-mono drawmap.exe ../../../../tests/test.map ./map.png
+LC_ALL=C mono drawmap.exe ../../../../tests/test.map ./map.png
 echo .: Testing shapeinfo.exe :.
-mono shapeinfo.exe ../../../../tests/point.shp
+LC_ALL=C mono shapeinfo.exe ../../../../tests/point.shp
 echo .: Testing getbytes.exe :.
-mono getbytes.exe ../../../../tests/test.map test_csharp2.png
+LC_ALL=C mono getbytes.exe ../../../../tests/test.map test_csharp2.png
 echo .: Testing RFC24.exe :.
-mono RFC24.exe ../../../../tests/test.map
+LC_ALL=C mono RFC24.exe ../../../../tests/test.map