Use CMake 3.27-style uppercase *_ROOT variables for simplicity

petk · petk · commit f4f2ff477a21 · 2024-11-23T02:47:14.000+01:00
diff --git a/cmake/cmake/modules/FindCrypt.cmake b/cmake/cmake/modules/FindCrypt.cmake
@@ -41,14 +41,15 @@ set_package_properties(
 ################################################################################
 # Disable built-in Crypt when overriding search paths in FindCrypt.
 ################################################################################
-if(CMAKE_PREFIX_PATH OR Crypt_ROOT)
+if(CMAKE_PREFIX_PATH OR Crypt_ROOT OR CRYPT_ROOT)
   find_path(
     _Crypt_INCLUDE_DIR
     NAMES
       crypt.h unistd.h
     PATHS
       ${CMAKE_PREFIX_PATH}
       ${Crypt_ROOT}
+      ${CRYPT_ROOT}
     PATH_SUFFIXES
       include
     NO_DEFAULT_PATH
diff --git a/cmake/cmake/modules/FindIconv.cmake b/cmake/cmake/modules/FindIconv.cmake
@@ -22,7 +22,7 @@ set_package_properties(
 
 # Adjustment when overriding the iconv library path, otherwise Iconv is first
 # searched in C library.
-if(CMAKE_PREFIX_PATH OR Iconv_ROOT)
+if(CMAKE_PREFIX_PATH OR Iconv_ROOT OR ICONV_ROOT)
   if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.31)
     set(Iconv_IS_BUILT_IN FALSE)
   else()
@@ -32,6 +32,7 @@ if(CMAKE_PREFIX_PATH OR Iconv_ROOT)
       PATHS
         ${CMAKE_PREFIX_PATH}
         ${Iconv_ROOT}
+        ${ICONV_ROOT}
       PATH_SUFFIXES
         # GNU libiconv on Alpine Linux has header located on a special location:
         include/gnu-libiconv
diff --git a/cmake/cmake/modules/FindIntl.cmake b/cmake/cmake/modules/FindIntl.cmake
@@ -5,7 +5,7 @@ Find the Intl library.
 
 Module overrides the upstream CMake `FindIntl` module with few customizations.
 
-Enables finding Intl library with `Intl_ROOT` hint variable.
+Enables finding Intl library with `INTL_ROOT` hint variable.
 
 See: https://cmake.org/cmake/help/latest/module/FindIntl.html
 #]=============================================================================]
@@ -19,13 +19,14 @@ set_package_properties(
 )
 
 # Disable built-in intl when overriding search paths in CMake's FindIntl.
-if(CMAKE_PREFIX_PATH OR Intl_ROOT)
+if(CMAKE_PREFIX_PATH OR Intl_ROOT OR INTL_ROOT)
   find_path(
     php_intl_INCLUDE_DIR
     NAMES libintl.h
     PATHS
       ${CMAKE_PREFIX_PATH}
       ${Intl_ROOT}
+      ${INTL_ROOT}
     PATH_SUFFIXES
       include
     NO_DEFAULT_PATH
diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt
@@ -40,7 +40,7 @@ Use system default cipher list instead of the hardcoded value for OpenSSL.
 Include Kerberos support for OpenSSL.
 
 Where to find Kerberos installation on the system, can be customized with the
-`Kerberos_ROOT` variable.
+`KERBEROS_ROOT` variable.
 
 Note, that Kerberos support has been removed as of OpenSSL 1.1.0, which makes
 this option deprecated.
diff --git a/cmake/ext/pdo_mysql/CMakeLists.txt b/cmake/ext/pdo_mysql/CMakeLists.txt
@@ -27,7 +27,7 @@ Build extension as shared library.
 Select the MySQL driver for the `pdo_mysql` extension.
 
 The `mysql` driver uses system MySQL library. Where to find the MySQL library
-installation on the system, can be customized with the `MySQL_ROOT` and
+installation on the system, can be customized with the `MYSQL_ROOT` and
 `MySQL_CONFIG_EXECUTABLE` variables.
 #]=============================================================================]
 
diff --git a/cmake/sapi/apache2handler/CMakeLists.txt b/cmake/sapi/apache2handler/CMakeLists.txt
@@ -17,7 +17,7 @@ be set automatically during the configuration step, if threaded Apache can be
 discovered on the system.
 
 Path where to look for the Apache installation on the system can be customized
-with the `Apache_ROOT` and `Apache_APXS_EXECUTABLE` variables.
+with the `APACHE_ROOT` and `Apache_APXS_EXECUTABLE` variables.
 
 For example:
 
diff --git a/cmake/sapi/fpm/CMakeLists.txt b/cmake/sapi/fpm/CMakeLists.txt
@@ -48,7 +48,7 @@ Where to find ACL installation on the system, can be customized with the
 Enable the AppArmor confinement through libapparmor.
 
 Where to find AppArmor installation on the system, can be customized with the
-`AppArmor_ROOT` variable.
+`APPARMOR_ROOT` variable.
 
 > [!NOTE]
 > This option is not available when the target system is Darwin (macOS) as this
@@ -62,7 +62,7 @@ Where to find AppArmor installation on the system, can be customized with the
 Enable the SELinux policy library support.
 
 Where to find SELinux installation on the system, can be customized with the
-`SELinux_ROOT` variable.
+`SELINUX_ROOT` variable.
 
 > [!NOTE]
 > This option is not available when the target system is Darwin (macOS) as this
@@ -76,7 +76,7 @@ Where to find SELinux installation on the system, can be customized with the
 Enable the systemd integration.
 
 Where to find systemd installation on the system, can be customized with the
-`Systemd_ROOT` variable.
+`SYSTEMD_ROOT` variable.
 
 > [!NOTE]
 > This option is not available when the target system is Darwin (macOS) as this
diff --git a/cmake/sapi/phpdbg/CMakeLists.txt b/cmake/sapi/phpdbg/CMakeLists.txt
@@ -36,7 +36,7 @@ through arrow keys. Requires the Editline library. If the PHP extension
 automatically enabled regardless of this option.
 
 Where to find the Editline installation on the system, can be customized with
-the `Editline_ROOT` variable.
+the `EDITLINE_ROOT` variable.
 #]=============================================================================]
 
 include(CheckSymbolExists)
