Fix globbing inconsistencies

Glob behaves differently on case-insensitive file systems such as on Windows and macOS. Otherwise here also the credits shell script is fetched.
petk · Dec 11, 2024 · 0aa3411 · 0aa3411
1 parent fd09510
commit 0aa3411
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/bin/init.cmake b/bin/init.cmake
@@ -14,7 +14,7 @@ Usage:
   cmake -P bin/init.cmake
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.25...3.31)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")

diff --git a/bin/php.cmake b/bin/php.cmake
@@ -33,7 +33,7 @@ Usage examples:
     ./bin/php.cmake
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.25...3.31)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -5,7 +5,6 @@ include(cmake/CMakeDefaults.cmake)
 
 message(STATUS "Initializing PHP build system")
 message(STATUS "=============================")
-
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
 

diff --git a/cmake/cmake/scripts/GenerateCredits.cmake b/cmake/cmake/scripts/GenerateCredits.cmake
@@ -31,8 +31,10 @@ set(template [[
 ]])
 
 file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
+# Case-sensitive filtering, GLOB on macOS/Windows is case-insensitive.
+list(FILTER credits INCLUDE REGEX ".*CREDITS$")
 
-foreach(credit ${credits})
+foreach(credit IN LISTS credits)
   cmake_path(GET credit PARENT_PATH dir)
   cmake_path(GET dir PARENT_PATH dir)
   cmake_path(GET dir FILENAME dir)
@@ -46,7 +48,7 @@ endforeach()
 
 list(REMOVE_DUPLICATES dirs)
 
-foreach(dir ${dirs})
+foreach(dir IN LISTS dirs)
   list(SORT ${dir}_credits CASE INSENSITIVE)
   list(JOIN ${dir}_credits ";\n" content)
   set(content "${template}${content};\n")

diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt
@@ -493,6 +493,8 @@ check_symbol_exists(
 
 block()
   file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
+  # Case-sensitive filtering, GLOB on macOS/Windows is case-insensitive.
+  list(FILTER credits INCLUDE REGEX ".*CREDITS$")
 
   # The CODEGEN keyword adds the custom command to a global 'codegen' target.
   set(codegen "")