Add various improvements

- Initial adjustments for build types and multi-config generators
- Configuration headers synced further
- Some variables are now resolved during the generation phase to be able
  to include generator expressions
- Some minor bugs fixed for generated files

Author: petk

bin/init.sh

@@ -228,11 +228,20 @@ if make -h 2>&1 | grep -q "\[-j max_jobs\]" \
   fi
 fi
 
+if test -n "$jobs"; then
+  jobs="-j $jobs"
+else
+  case $generator in
+    Ninja*);;
+    *) jobs=-j;;
+  esac
+fi
+
 cd php-src
 
 # Run CMake preset configuration.
 eval "'$cmake' --preset $preset $cmake_debug_options $options $generator_option"
 
 # Run build step using preset and jobs arguments passed after the arguments for
 # exotic make implementations, such as dmake on illumos.
-eval "'$cmake' --build --preset $preset $cmake_verbose -- -j $jobs"
+eval "'$cmake' --build --preset $preset $cmake_verbose -- $jobs"

cmake/CMakeLists.txt

@@ -9,6 +9,7 @@ Running system checks
 ")
 
 message(STATUS "CMake version: ${CMAKE_VERSION}")
+message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
 
 # Set the PHP_VERSION_* variables from configure.ac.
 include(cmake/Version.cmake)

cmake/cmake/BuildTypes.cmake

@@ -6,15 +6,15 @@ include_guard(GLOBAL)
 
 block()
   if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
-    if(is_multi_config)
+    if(isMultiConfig)
       if(NOT "DebugAssertions" IN_LIST CMAKE_CONFIGURATION_TYPES)
         list(APPEND CMAKE_CONFIGURATION_TYPES DebugAssertions)
       endif()
     else()
       set(
-        allowed_build_types
+        allowedBuildTypes
         Debug
         MinSizeRel
         Release
@@ -25,12 +25,12 @@ block()
 
       set_property(
         CACHE CMAKE_BUILD_TYPE
-        PROPERTY STRINGS "${allowed_build_types}"
+        PROPERTY STRINGS "${allowedBuildTypes}"
       )
 
       if(NOT CMAKE_BUILD_TYPE)
         set(CMAKE_BUILD_TYPE Debug CACHE STRING "" FORCE)
-      elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowed_build_types)
+      elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowedBuildTypes)
         message(FATAL_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE}")
       endif()
     endif()

cmake/cmake/Configuration.cmake

@@ -224,17 +224,11 @@ block()
         set(extension_dir "${extension_dir}-zts")
       endif()
 
-      if(PHP_DEBUG)
-        set(extension_dir "${extension_dir}-debug")
-      endif()
+      set(extension_dir "${extension_dir}$<IF:$<CONFIG:Debug>,-debug,>")
     else()
       set(extension_dir "${extension_dir}/extensions")
 
-      if(PHP_DEBUG)
-        set(extension_dir "${extension_dir}/debug")
-      else()
-        set(extension_dir "${extension_dir}/no-debug")
-      endif()
+      set(extension_dir "${extension_dir}/$<IF:$<CONFIG:Debug>,debug,no-debug>")
 
       if(PHP_THREAD_SAFETY)
         set(extension_dir "${extension_dir}-zts")

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -116,9 +116,9 @@ function(_php_configure_file_parse_variables)
         replaced
         "${value}"
       )
-      list(APPEND resultValues ${replaced})
+      list(APPEND resultValues "${replaced}")
     else()
-      list(APPEND resultValues ${value})
+      list(APPEND resultValues "${value}")
     endif()
 
     # The resultValuesInCode are for the configure_file inside the install(CODE)
@@ -184,6 +184,12 @@ function(php_configure_file)
     )
   endif()
 
+  cmake_path(GET ___phpConfigureFileOutput FILENAME filename)
+  set(
+    ___phpConfigureFileOutputTemporary
+    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${filename}.cmake.in
+  )
+
   if(parsed_VARIABLES)
     _php_configure_file_parse_variables(
       "${parsed_VARIABLES}"
@@ -200,9 +206,18 @@ function(php_configure_file)
 
     configure_file(
       ${___phpConfigureFileTemplate}
-      ${___phpConfigureFileOutput}
+      ${___phpConfigureFileOutputTemporary}
       @ONLY
     )
+
+    # To be able to evaluate possible additional generator expressions.
+    file(
+      GENERATE
+      # TODO: Multi-config generators need to write separate files.
+      #OUTPUT $<CONFIG>/file.output
+      OUTPUT ${___phpConfigureFileOutput}
+      INPUT ${___phpConfigureFileOutputTemporary}
+    )
   endblock()
 
   install(CODE "

cmake/main/CMakeLists.txt

@@ -271,15 +271,53 @@ function(_php_main_create_files)
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     message(STATUS "Creating main/config.w32.h")
-    configure_file(main/config.w32.cmake.h.in main/config.w32.h @ONLY)
+    configure_file(
+      main/config.w32.cmake.h.in
+      main/CMakeFiles/config.w32.cmake.h.in
+      @ONLY
+    )
+
+    file(
+      GENERATE
+      # TODO: Multi-config generators need to write separate files.
+      #OUTPUT $<CONFIG>/main/config.w32.h
+      OUTPUT ${PHP_BINARY_DIR}/main/config.w32.h
+      INPUT ${PHP_BINARY_DIR}/main/CMakeFiles/config.w32.cmake.h.in
+    )
   else()
     message(STATUS "Creating main/build-defs.h")
-    configure_file(main/build-defs.h.in main/build-defs.h @ONLY)
+    configure_file(
+      main/build-defs.h.in
+      main/CMakeFiles/build-defs.h.in
+      @ONLY
+    )
+
+    # To be able to evaluate the generator expressions.
+    file(
+      GENERATE
+      # TODO: Multi-config generators need to write separate files.
+      #OUTPUT $<CONFIG>/main/build-defs.h
+      OUTPUT ${PHP_BINARY_DIR}/main/build-defs.h
+      INPUT ${PHP_BINARY_DIR}/main/CMakeFiles/build-defs.h.in
+    )
 
     set(HAVE_BUILD_DEFS_H 1)
 
     message(STATUS "Creating main/php_config.h")
-    configure_file(main/php_config.cmake.h.in main/php_config.h @ONLY)
+    configure_file(
+      main/php_config.cmake.h.in
+      main/CMakeFiles/php_config.cmake.h.in
+      @ONLY
+    )
+
+    # To be able to evaluate the generator expressions.
+    file(
+      GENERATE
+      # TODO: Multi-config generators need to write separate files.
+      #OUTPUT $<CONFIG>/main/php_config.h
+      OUTPUT ${PHP_BINARY_DIR}/main/php_config.h
+      INPUT ${PHP_BINARY_DIR}/main/CMakeFiles/php_config.cmake.h.in
+    )
   endif()
 
   message(STATUS "Creating main/php_version.h")

cmake/main/config.w32.cmake.h.in

@@ -1092,8 +1092,8 @@
 /* Define to 1 if you have the 'mremap' function. */
 #cmakedefine HAVE_MREMAP 1
 
-/* Define to 1 if you have the <mscoree.h> header file, and to 0 if not. */
-#cmakedefine01 HAVE_MSCOREE_H
+/* Define to 1 if you have the <mscoree.h> header file. */
+#cmakedefine HAVE_MSCOREE_H
 
 /* Define to 1 if you have the 'nanosleep' function. */
 #cmakedefine HAVE_NANOSLEEP 1
@@ -1759,9 +1759,6 @@
 /* Define to 1 if the PHP extension 'zlib' is available. */
 #cmakedefine HAVE_ZLIB 1
 
-/* Define to 1 if you have the <zlib.h> header file, and to 0 if not. */
-#cmakedefine01 HAVE_ZLIB_H
-
 /* Define to 1 if _controlfp is present and usable. */
 #cmakedefine HAVE__CONTROLFP 1
 
@@ -2074,6 +2071,13 @@
 /* Define to 1 if checking the stack limit is supported. */
 #cmakedefine ZEND_CHECK_STACK_LIMIT 1
 
+/* Define to 1 if debugging is enabled, and to 0 if not.
+   TODO: This is still not good enough because multi-config generators would
+   then need separate php_config.h files for each build type. */
+#ifndef ZEND_DEBUG
+# define ZEND_DEBUG $<IF:$<CONFIG:Debug>,1,0>
+#endif
+
 /* Define to 1 if Zend fiber uses ucontext instead of boost context. */
 #cmakedefine ZEND_FIBER_UCONTEXT 1
 

cmake/main/php_config.cmake.h.in

@@ -1083,8 +1083,8 @@
 /* Define to 1 if you have the 'mremap' function. */
 #cmakedefine HAVE_MREMAP 1
 
-/* Define to 1 if you have the <mscoree.h> header file, and to 0 if not. */
-#cmakedefine01 HAVE_MSCOREE_H
+/* Define to 1 if you have the <mscoree.h> header file. */
+#cmakedefine HAVE_MSCOREE_H
 
 /* Define to 1 if you have the 'nanosleep' function. */
 #cmakedefine HAVE_NANOSLEEP 1
@@ -1747,9 +1747,6 @@
 /* Define to 1 if the PHP extension 'zlib' is available. */
 #cmakedefine HAVE_ZLIB 1
 
-/* Define to 1 if you have the <zlib.h> header file, and to 0 if not. */
-#cmakedefine01 HAVE_ZLIB_H
-
 /* Define to 1 if _controlfp is present and usable. */
 #cmakedefine HAVE__CONTROLFP 1
 
@@ -2039,10 +2036,11 @@
 /* Define to 1 if checking the stack limit is supported. */
 #cmakedefine ZEND_CHECK_STACK_LIMIT 1
 
-/* Whether build type is Debug or DebugAssertions.
-   TODO: Fix this better. */
+/* Define to 1 if debugging is enabled, and to 0 if not.
+   TODO: This is still not good enough because multi-config generators would
+   then need separate php_config.h files for each build type. */
 #ifndef ZEND_DEBUG
-#cmakedefine01 ZEND_DEBUG
+# define ZEND_DEBUG $<IF:$<CONFIG:Debug>,1,0>
 #endif
 
 /* Define to 1 if Zend fiber uses ucontext instead of boost context. */

cmake/scripts/CMakeLists.txt

@@ -49,7 +49,7 @@ block()
       exec_prefix "$<INSTALL_PREFIX>"
       PHP_VERSION "${PHP_VERSION}"
       PHP_VERSION_ID "${PHP_VERSION_ID}"
-      include_dir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
+      includedir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
       # TODO:
       PHP_LDFLAGS ""
       # TODO: