Refactor nits

- php_version.h created directly instead of via deferred call
- php_version.h template moved to CMakeLists.txt
- ext/mbstring refactored a bit

Author: petk

cmake/ext/mbstring/CMakeLists.txt

@@ -71,6 +71,10 @@ if(NOT EXT_MBSTRING)
   return()
 endif()
 
+################################################################################
+# Configure mbstring extension.
+################################################################################
+
 if(EXT_MBSTRING_SHARED)
   add_library(php_mbstring SHARED)
 else()
@@ -146,8 +150,20 @@ target_sources(
         ${CMAKE_CURRENT_BINARY_DIR}/libmbfl/config.h
 )
 
+target_compile_definitions(php_mbstring PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
+
+# The mbstring extension doesn't seem to support interprocedural optimization
+# (IPO).
+set_target_properties(php_mbstring PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF)
+
 add_dependencies(php_mbstring php_pcre)
 
+set(HAVE_MBSTRING TRUE)
+
+################################################################################
+# Configure libmbfl.
+################################################################################
+
 # TODO: Fix this better. See also https://github.com/php/php-src/pull/13713
 # TODO: Should status message be here?
 message(STATUS "Creating ext/mbstring/libmbfl/config.h")
@@ -161,9 +177,17 @@ file(CONFIGURE OUTPUT libmbfl/config.h CONTENT [[
 #endif
 ]])
 
-# The mbstring extension doesn't seem to support interprocedural optimization
-# (IPO).
-set_target_properties(php_mbstring PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF)
+target_include_directories(
+  php_mbstring
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl
+    ${CMAKE_CURRENT_BINARY_DIR}/libmbfl
+    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl/mbfl
+)
+
+################################################################################
+# Multibyte regex.
+################################################################################
 
 if(EXT_MBSTRING_MBREGEX)
   find_package(Oniguruma)
@@ -177,7 +201,7 @@ if(EXT_MBSTRING_MBREGEX)
   target_link_libraries(php_mbstring PRIVATE Oniguruma::Oniguruma)
 
   if(TARGET Oniguruma::Oniguruma)
-    message(CHECK_START "Checking if Oniguruma has invalid entry for KOI8 encoding")
+    message(CHECK_START "Checking for invalid KOI8 encoding entry in Oniguruma")
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
       set(CMAKE_REQUIRED_LIBRARIES Oniguruma::Oniguruma)
@@ -196,7 +220,6 @@ if(EXT_MBSTRING_MBREGEX)
       message(CHECK_PASS "no")
     else()
       message(CHECK_FAIL "yes")
-
       set(PHP_ONIG_BAD_KOI8_ENTRY TRUE)
     endif()
   endif()
@@ -211,8 +234,6 @@ if(EXT_MBSTRING_MBREGEX)
       $<$<PLATFORM_ID:Windows>:ONIG_EXTERN=extern>
   )
 
-  set(HAVE_MBREGEX TRUE)
-
   target_sources(
     php_mbstring
     PRIVATE
@@ -223,18 +244,8 @@ if(EXT_MBSTRING_MBREGEX)
           php_mbregex.h
           php_onig_compat.h
   )
-endif()
-
-target_compile_definitions(php_mbstring PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
-target_include_directories(
-  php_mbstring
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl
-    ${CMAKE_CURRENT_BINARY_DIR}/libmbfl
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl/mbfl
-)
-
-set(HAVE_MBSTRING TRUE)
+  set(HAVE_MBREGEX TRUE)
+endif()
 
 configure_file(cmake/config.h.in config.h)

cmake/main/CMakeLists.txt

@@ -271,6 +271,29 @@ if(PHP_DMALLOC)
   endif()
 endif()
 
+################################################################################
+# Create main/php_version.h. Template is based on the configure.ac.
+################################################################################
+
+cmake_path(
+  RELATIVE_PATH
+  CMAKE_CURRENT_SOURCE_DIR
+  BASE_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE relativeSourceDir
+)
+
+message(STATUS "Creating ${relativeSourceDir}/php_version.h")
+file(CONFIGURE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/php_version.h CONTENT [[
+/* automatically generated by configure */
+/* edit configure.ac to change version number */
+#define PHP_MAJOR_VERSION @PHP_VERSION_MAJOR@
+#define PHP_MINOR_VERSION @PHP_VERSION_MINOR@
+#define PHP_RELEASE_VERSION @PHP_VERSION_PATCH@
+#define PHP_EXTRA_VERSION "@PHP_VERSION_LABEL@"
+#define PHP_VERSION "@PHP_VERSION@"
+#define PHP_VERSION_ID @PHP_VERSION_ID@
+]])
+
 ################################################################################
 # Create main/internal_functions*.c files with a list of static enabled PHP
 # extensions based on the PHP SAPI type.
@@ -319,17 +342,17 @@ block()
     RELATIVE_PATH
     CMAKE_CURRENT_BINARY_DIR
     BASE_DIRECTORY ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE relativeDir
+    OUTPUT_VARIABLE relativeBinaryDir
   )
 
   set(EXT_INCLUDE_CODE "${includes}")
   set(EXT_MODULE_PTRS "${pointers}")
-  message(STATUS "Creating ${relativeDir}/internal_functions.c")
+  message(STATUS "Creating ${relativeBinaryDir}/internal_functions.c")
   configure_file(internal_functions.c.in internal_functions.c)
 
   set(EXT_INCLUDE_CODE "${includesCli}")
   set(EXT_MODULE_PTRS "${pointersCli}")
-  message(STATUS "Creating ${relativeDir}/internal_functions_cli.c")
+  message(STATUS "Creating ${relativeBinaryDir}/internal_functions_cli.c")
   configure_file(internal_functions.c.in internal_functions_cli.c)
 endblock()
 
@@ -420,12 +443,6 @@ function(_php_main_create_files)
     set(DEFAULT_SHORT_OPEN_TAG "0")
   endif()
 
-  message(STATUS "Creating main/php_version.h")
-  configure_file(
-    main/cmake/php_version.h.in
-    ${PHP_SOURCE_DIR}/main/php_version.h
-  )
-
   # Add sapis configuration.
   set(config "")
   get_property(sapis GLOBAL PROPERTY PHP_SAPIS)
@@ -475,7 +492,7 @@ function(_php_main_create_files)
       GENERATE
       # TODO: Multi-config generators need to write separate files.
       #OUTPUT $<CONFIG>/main/build-defs.h
-      OUTPUT ${PHP_BINARY_DIR}/main/build-defs.h
+      OUTPUT main/build-defs.h
       CONTENT "${content}"
     )
 
@@ -526,7 +543,7 @@ function(_php_main_create_files)
     GENERATE
     # TODO: Multi-config generators need to write separate files.
     #OUTPUT $<CONFIG>/main/${file}
-    OUTPUT ${PHP_BINARY_DIR}/main/${file}
+    OUTPUT main/${file}
     CONTENT "${content}"
   )
 endfunction()