Fix CMake code

petk · petk · commit 2bfabe36cec5 · 2024-12-03T21:23:14.000+01:00
Setting variable without a value argument is the same as doing unset(),
which isn't what is wanted in these cases. Local variable needs to be
defined but without value to not grab some accidental cache variable
with the same name.
diff --git a/cmake/cmake/modules/FindACL.cmake b/cmake/cmake/modules/FindACL.cmake
@@ -134,7 +134,7 @@ if(NOT DEFINED ACL_IS_BUILT_IN)
   endblock()
 endif()
 
-set(_ACL_REQUIRED_VARS)
+set(_ACL_REQUIRED_VARS "")
 if(ACL_IS_BUILT_IN)
   set(_ACL_REQUIRED_VARS _ACL_IS_BUILT_IN_MSG)
   set(_ACL_IS_BUILT_IN_MSG "built in to C library")
diff --git a/cmake/cmake/modules/FindCapstone.cmake b/cmake/cmake/modules/FindCapstone.cmake
@@ -70,7 +70,7 @@ block(PROPAGATE Capstone_VERSION)
       "^#[ \t]*define[ \t]+CS_(API_MAJOR|API_MINOR|VERSION_EXTRA)[ \t]+[0-9]+[ \t]*$"
     )
 
-    set(Capstone_VERSION)
+    set(Capstone_VERSION "")
 
     foreach(item CS_API_MAJOR CS_API_MINOR CS_VERSION_EXTRA)
       foreach(line ${results})
diff --git a/cmake/cmake/modules/FindCrypt.cmake b/cmake/cmake/modules/FindCrypt.cmake
@@ -75,7 +75,7 @@ if(NOT DEFINED Crypt_IS_BUILT_IN)
   cmake_pop_check_state()
 endif()
 
-set(_Crypt_REQUIRED_VARS)
+set(_Crypt_REQUIRED_VARS "")
 if(Crypt_IS_BUILT_IN)
   set(_Crypt_REQUIRED_VARS _Crypt_IS_BUILT_IN_MSG)
   set(_Crypt_IS_BUILT_IN_MSG "built in to C library")
diff --git a/cmake/cmake/modules/FindDTrace.cmake b/cmake/cmake/modules/FindDTrace.cmake
@@ -169,7 +169,7 @@ function(dtrace_target)
     set(parsed_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${parsed_HEADER})
   endif()
 
-  set(sources)
+  set(sources "")
   foreach(source IN LISTS parsed_SOURCES)
     if(NOT IS_ABSOLUTE ${source})
       set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source})
diff --git a/cmake/cmake/modules/FindDbm.cmake b/cmake/cmake/modules/FindDbm.cmake
@@ -60,7 +60,7 @@ if(NOT DEFINED Dbm_IS_BUILT_IN)
   cmake_pop_check_state()
 endif()
 
-set(_Dbm_REQUIRED_VARS)
+set(_Dbm_REQUIRED_VARS "")
 if(Dbm_IS_BUILT_IN)
   set(_Dbm_REQUIRED_VARS _Dbm_IS_BUILT_IN_MSG)
   set(_Dbm_IS_BUILT_IN_MSG "built in to C library")
diff --git a/cmake/cmake/modules/FindGMP.cmake b/cmake/cmake/modules/FindGMP.cmake
@@ -71,7 +71,7 @@ block(PROPAGATE GMP_VERSION)
       "^#[ \t]*define[ \t]+__GNU_MP_VERSION(_MINOR|_PATCHLEVEL)?[ \t]+[0-9]+[ \t]*$"
     )
 
-    set(GMP_VERSION)
+    set(GMP_VERSION "")
 
     foreach(item VERSION VERSION_MINOR VERSION_PATCHLEVEL)
       foreach(line ${results})
diff --git a/cmake/cmake/modules/FindGcov.cmake b/cmake/cmake/modules/FindGcov.cmake
@@ -189,7 +189,7 @@ macro(gcov_generate_report)
 
   # Create a list of PHP SAPIs with genex for usage in the add_custom_command.
   block(PROPAGATE php_sapis)
-    set(php_sapis)
+    set(php_sapis "")
     file(GLOB directories ${PROJECT_SOURCE_DIR}/sapi/*)
     foreach(dir ${directories})
       cmake_path(GET dir FILENAME sapi)
diff --git a/cmake/cmake/modules/FindLDAP.cmake b/cmake/cmake/modules/FindLDAP.cmake
@@ -136,7 +136,7 @@ block(PROPAGATE LDAP_VERSION)
       "^#[ \t]*define[ \t]+LDAP_VENDOR_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+[ \t]*$"
     )
 
-    set(LDAP_VERSION)
+    set(LDAP_VERSION "")
 
     foreach(item MAJOR MINOR PATCH)
       foreach(line ${results})
diff --git a/cmake/cmake/modules/FindNdbm.cmake b/cmake/cmake/modules/FindNdbm.cmake
@@ -54,7 +54,7 @@ if(NOT DEFINED Ndbm_IS_BUILT_IN)
   cmake_pop_check_state()
 endif()
 
-set(_Ndbm_REQUIRED_VARS)
+set(_Ndbm_REQUIRED_VARS "")
 if(Ndbm_IS_BUILT_IN)
   set(_Ndbm_REQUIRED_VARS _Ndbm_IS_BUILT_IN_MSG)
   set(_Ndbm_IS_BUILT_IN_MSG "built in to C library")
diff --git a/cmake/cmake/modules/FindODBC.cmake b/cmake/cmake/modules/FindODBC.cmake
@@ -63,12 +63,12 @@ enhancements and adjustments for the PHP build workflow.
 include(FeatureSummary)
 
 # Define internal variables
-set(_odbc_include_paths)
-set(_odbc_lib_paths)
-set(_odbc_lib_names)
-set(_odbc_required_libs_names)
-set(_odbc_config_names)
-set(_reason)
+set(_odbc_include_paths "")
+set(_odbc_lib_paths "")
+set(_odbc_lib_names "")
+set(_odbc_required_libs_names "")
+set(_odbc_config_names "")
+set(_reason "")
 
 ### To manually override build options of the ODBC library ####################
 set(ODBC_COMPILE_DEFINITIONS "" CACHE STRING "ODBC library compile definitions")
diff --git a/cmake/cmake/modules/FindSendmail.cmake b/cmake/cmake/modules/FindSendmail.cmake
@@ -27,7 +27,7 @@ set_package_properties(
     DESCRIPTION "Mail Transport Agent"
 )
 
-set(_reason)
+set(_reason "")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(_sendmailIsBuiltInMsg "PHP built-in mailer (Windows)")
diff --git a/cmake/cmake/modules/PHP/AddCustomCommand.cmake b/cmake/cmake/modules/PHP/AddCustomCommand.cmake
@@ -79,7 +79,7 @@ function(php_add_custom_command)
   if(parsed_VERBATIM)
     set(verbatim VERBATIM)
   else()
-    set(verbatim)
+    set(verbatim "")
   endif()
 
   if(PHPSystem_EXECUTABLE)
diff --git a/cmake/cmake/modules/PHP/ConfigureFile.cmake b/cmake/cmake/modules/PHP/ConfigureFile.cmake
@@ -74,7 +74,7 @@ function(_php_configure_file_parse_variables)
   endforeach()
 
   # Replace possible semicolons with a generator expression.
-  set(processedItems)
+  set(processedItems "")
   foreach(item IN LISTS ARGV0)
     if(item MATCHES [[.*\;.*]])
       string(
diff --git a/cmake/cmake/modules/PHP/Extensions.cmake b/cmake/cmake/modules/PHP/Extensions.cmake
@@ -157,7 +157,7 @@ function(_php_extensions_sort)
     )
 
     if(dependencies)
-      foreach(dependency ${dependencies})
+      foreach(dependency IN LISTS dependencies)
         list(REMOVE_ITEM extensionsMiddle ${dependency})
 
         if(NOT dependency IN_LIST extensionsBefore)
@@ -204,7 +204,7 @@ function(_php_extensions_parse_dependencies extension result)
 
   set(allDependencies "")
 
-  foreach(match ${matches})
+  foreach(match IN LISTS matches)
     if(match MATCHES "${regex}")
       if(CMAKE_MATCH_1)
         string(STRIP "${CMAKE_MATCH_1}" dependencies)
@@ -220,7 +220,7 @@ function(_php_extensions_parse_dependencies extension result)
 
     get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS)
 
-    foreach(dependency ${allDependencies})
+    foreach(dependency IN LISTS allDependencies)
       if(NOT "${dependency}" IN_LIST allExtensions)
         list(REMOVE_ITEM allDependencies ${dependency})
       endif()
@@ -455,7 +455,7 @@ endfunction()
 # define them for shared extensions.
 function(php_extensions_configure_headers)
   get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
-  foreach(extension ${extensions})
+  foreach(extension IN LISTS extensions)
     if(NOT TARGET php_${extension})
       continue()
     endif()
@@ -514,7 +514,7 @@ function(_php_extensions_validate)
 
     get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS)
 
-    foreach(dependency ${dependencies})
+    foreach(dependency IN LISTS dependencies)
       # Skip dependencies that are not PHP extensions.
       if(NOT dependency IN_LIST allExtensions)
         continue()
diff --git a/cmake/cmake/modules/PHP/FeatureSummary.cmake b/cmake/cmake/modules/PHP/FeatureSummary.cmake
@@ -52,7 +52,7 @@ function(php_feature_summary_preamble_add_item label value output)
     string(REPEAT "." ${numberOfDots} leader)
     set(leader " ${leader} ")
   else()
-    set(leader)
+    set(leader "")
   endif()
 
   string(APPEND ${output} " * ${label}${leader}: ${value}\n")
@@ -74,7 +74,7 @@ function(php_feature_summary_preamble result)
   endif()
 
   if(CMAKE_C_COMPILER_LOADED)
-    set(compiler)
+    set(compiler "")
     if(CMAKE_C_COMPILER_ID)
       string(APPEND compiler "${CMAKE_C_COMPILER_ID}")
     endif()
@@ -91,7 +91,7 @@ function(php_feature_summary_preamble result)
   endif()
 
   if(CMAKE_CXX_COMPILER_LOADED)
-    set(compiler)
+    set(compiler "")
     if(CMAKE_CXX_COMPILER_ID)
       string(APPEND compiler "${CMAKE_CXX_COMPILER_ID}")
     endif()
@@ -206,7 +206,7 @@ function(php_feature_summary)
 
   get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
 
-  foreach(extension ${extensions})
+  foreach(extension IN LISTS extensions)
     if(NOT TARGET php_${extension})
       continue()
     endif()
@@ -225,7 +225,7 @@ function(php_feature_summary)
 
     get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS)
 
-    foreach(dependency ${dependencies})
+    foreach(dependency IN LISTS dependencies)
       # Skip dependencies that are not inside the current project.
       if(NOT dependency IN_LIST allExtensions)
         continue()
@@ -260,7 +260,7 @@ function(php_feature_summary)
     list(REMOVE_DUPLICATES missingExtensions)
     set(message "The following missing PHP extensions must be enabled:\n\n")
 
-    foreach(extension ${missingExtensions})
+    foreach(extension IN LISTS missingExtensions)
       string(TOUPPER "${extension}" extensionUpper)
       string(
         APPEND
diff --git a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake
@@ -173,7 +173,7 @@ function(pkgconfig_generate_pc)
         string(REGEX REPLACE "^.*-o php " "" content "${content}")
         string(REPLACE " " ";" content "${content}")
         set(libs "")
-        foreach(item ${content})
+        foreach(item IN LISTS content)
           if(IS_ABSOLUTE "${item}")
             list(APPEND libs "${item}")
           elseif(item MATCHES "^-l")
@@ -192,7 +192,7 @@ function(pkgconfig_generate_pc)
         )
         string(REGEX MATCHALL [[NEEDED[ ]+[A-Za-z0-9.]+]] matches "${result}")
         set(libraries "")
-        foreach(library ${matches})
+        foreach(library IN LISTS matches)
           if(library MATCHES [[NEEDED[ ]+(.+)]])
             string(STRIP "${CMAKE_MATCH_1}" library)
             string(REGEX REPLACE "^lib(.*).so.*" [[\1]] library "${library}")
diff --git a/cmake/cmake/modules/PHP/Rebuild.cmake b/cmake/cmake/modules/PHP/Rebuild.cmake
@@ -19,7 +19,7 @@ function(_php_rebuild_get_all_targets result dir)
   get_property(targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
   get_property(subdirs DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
 
-  foreach(subdir ${subdirs})
+  foreach(subdir IN LISTS subdirs)
     cmake_language(CALL ${CMAKE_CURRENT_FUNCTION} subdirTargets ${subdir})
     list(APPEND targets ${subdirTargets})
   endforeach()
diff --git a/cmake/cmake/modules/PHP/SearchLibraries.cmake b/cmake/cmake/modules/PHP/SearchLibraries.cmake
@@ -224,7 +224,7 @@ function(php_search_libraries)
     endif()
 
     list(LENGTH parsed_TARGET length)
-    set(targetScope)
+    set(targetScope "")
     if(length GREATER 1)
       list(GET parsed_TARGET 1 targetScope)
     endif()
@@ -247,7 +247,7 @@ function(php_search_libraries)
 
   # Check if given header(s) can be included.
   set(headersFound "")
-  foreach(header ${headers})
+  foreach(header IN LISTS headers)
     if(recheckHeaders)
       set(id _PHP_SEARCH_LIBRARIES_HEADER_${headersFound}_${header})
     else()
@@ -292,7 +292,7 @@ function(php_search_libraries)
   unset(${libraryInternalVariable} CACHE)
 
   # Now, check if linking any given library helps finding the symbol.
-  foreach(library ${libraries})
+  foreach(library IN LISTS libraries)
     unset(${symbolResultVariable} CACHE)
 
     if(NOT CMAKE_REQUIRED_QUIET)
diff --git a/cmake/cmake/modules/PHP/Set.cmake b/cmake/cmake/modules/PHP/Set.cmake
@@ -220,7 +220,7 @@ function(php_set)
   _php_set_validate_arguments("${ARGN}")
 
   set(doc "")
-  foreach(string ${parsed_DOC})
+  foreach(string IN LISTS parsed_DOC)
     string(APPEND doc "${string}")
   endforeach()
 
diff --git a/cmake/cmake/modules/PHP/Stubs.cmake b/cmake/cmake/modules/PHP/Stubs.cmake
@@ -64,7 +64,7 @@ function(_php_stubs_get_binary_targets result dir)
   get_property(subdirs DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
 
   # Filter only binary targets.
-  set(binaryTargets)
+  set(binaryTargets "")
   foreach(target ${targets})
     get_target_property(type ${target} TYPE)
     if(type MATCHES "^((STATIC|MODULE|SHARED|OBJECT)_LIBRARY|EXECUTABLE)$")
@@ -101,7 +101,7 @@ block()
 
   _php_stubs_get_binary_targets(targets ${PROJECT_SOURCE_DIR})
 
-  set(stubs)
+  set(stubs "")
   foreach(target ${targets})
     list(
       APPEND
@@ -123,7 +123,7 @@ block()
     CONTENT "${content}"
   )
 
-  set(targetOptions)
+  set(targetOptions "")
   if(NOT PHPSystem_EXECUTABLE)
     set(targetOptions ALL DEPENDS ${targets})
   endif()
diff --git a/cmake/ext/pdo_odbc/CMakeLists.txt b/cmake/ext/pdo_odbc/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
 
 if(TARGET ODBC::ODBC)
   block()
-    set(haveSomeHeaders)
+    set(haveSomeHeaders FALSE)
 
     foreach(
       header
diff --git a/cmake/ext/phar/CMakeLists.txt b/cmake/ext/phar/CMakeLists.txt
@@ -132,7 +132,7 @@ else()
   return()
 endif()
 
-set(pharSharedOptions)
+set(pharSharedOptions "")
 if(EXT_PHAR_SHARED OR BUILD_SHARED_LIBS)
   set(
     pharSharedOptions
diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt
@@ -495,7 +495,7 @@ block()
   file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
 
   # The CODEGEN keyword adds the custom command to a global 'codegen' target.
-  set(codegen)
+  set(codegen "")
   if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.31)
     set(codegen CODEGEN)
   endif()
diff --git a/cmake/pear/CMakeLists.txt b/cmake/pear/CMakeLists.txt
@@ -121,7 +121,7 @@ block()
   endforeach()
 endblock()
 
-set(PHP_EXECUTABLE)
+set(PHP_EXECUTABLE "")
 if(NOT CMAKE_CROSSCOMPILING)
   set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
 elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
diff --git a/cmake/sapi/fpm/cmake/CheckTrace.cmake b/cmake/sapi/fpm/cmake/CheckTrace.cmake
@@ -134,7 +134,7 @@ if(NOT HAVE_PTRACE AND NOT HAVE_MACH_VM_READ)
   message(CHECK_START "Checking for process memory access file")
 
   if(NOT CMAKE_CROSSCOMPILING)
-    set(PROC_MEM_FILE)
+    set(PROC_MEM_FILE "")
     if(EXISTS /proc/self/mem)
       set(PROC_MEM_FILE "mem")
     elseif(EXISTS /proc/self/as)
diff --git a/cmake/sapi/phpdbg/CMakeLists.txt b/cmake/sapi/phpdbg/CMakeLists.txt
@@ -185,7 +185,7 @@ if(SAPI_PHPDBG_READLINE OR EXT_READLINE)
 
     target_link_libraries(php_phpdbg PRIVATE Readline::Readline)
 
-    set(HAVE_LIBREADLINE)
+    set(HAVE_LIBREADLINE TRUE)
   else()
     find_package(Editline)
     set_package_properties(

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ block(PROPAGATE Capstone_VERSION)`
`70`	`70`	`"^#[ \t]define[ \t]+CS_(API_MAJOR\|API_MINOR\|VERSION_EXTRA)[ \t]+[0-9]+[ \t]$"`
`71`	`71`	`)`
`72`	`72`
`73`		`- set(Capstone_VERSION)`
	`73`	`+ set(Capstone_VERSION "")`
`74`	`74`
`75`	`75`	`foreach(item CS_API_MAJOR CS_API_MINOR CS_VERSION_EXTRA)`
`76`	`76`	`foreach(line ${results})`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ block(PROPAGATE GMP_VERSION)`
`71`	`71`	`"^#[ \t]define[ \t]+__GNU_MP_VERSION(_MINOR\|_PATCHLEVEL)?[ \t]+[0-9]+[ \t]$"`
`72`	`72`	`)`
`73`	`73`
`74`		`- set(GMP_VERSION)`
	`74`	`+ set(GMP_VERSION "")`
`75`	`75`
`76`	`76`	`foreach(item VERSION VERSION_MINOR VERSION_PATCHLEVEL)`
`77`	`77`	`foreach(line ${results})`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ block(PROPAGATE LDAP_VERSION)`
`136`	`136`	`"^#[ \t]define[ \t]+LDAP_VENDOR_VERSION_(MAJOR\|MINOR\|PATCH)[ \t]+[0-9]+[ \t]$"`
`137`	`137`	`)`
`138`	`138`
`139`		`- set(LDAP_VERSION)`
	`139`	`+ set(LDAP_VERSION "")`
`140`	`140`
`141`	`141`	`foreach(item MAJOR MINOR PATCH)`
`142`	`142`	`foreach(line ${results})`