Add minor various improvements

- Use generator expression for the prehistoric _USE_32BIT_TIME_T compile
  definition.
- Move Zend Engine configuration a bit to match the configuration flow
  from CMakeLists.txt.

Author: petk

cmake/main/CMakeLists.txt

@@ -356,10 +356,6 @@ function(_php_main_create_files)
   message(STATUS "Creating main/php_version.h")
   configure_file(main/php_version.h.in main/php_version.h @ONLY)
 
-  # Add Zend Engine configuration.
-  file(READ ${CMAKE_CURRENT_BINARY_DIR}/Zend/CMakeFiles/zend_config.h config)
-  string(STRIP "${config}" ZEND_CONFIGURATION)
-
   # Add sapis configuration.
   set(config "")
   get_cmake_property(sapis PHP_SAPIS)
@@ -388,6 +384,10 @@ function(_php_main_create_files)
   endforeach()
   string(STRIP "${config}" PHP_EXTENSIONS_CONFIGURATION)
 
+  # Add Zend Engine configuration.
+  file(READ ${CMAKE_CURRENT_BINARY_DIR}/Zend/CMakeFiles/zend_config.h config)
+  string(STRIP "${config}" ZEND_CONFIGURATION)
+
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(PHP_CONFIG_H_WINDOWS 1)
     set(file config.w32.h)

cmake/main/php_config.cmake.h.in

@@ -701,12 +701,6 @@
 /* Define to 1 when using musl libc. */
 #cmakedefine __MUSL__ 1
 
-/*****************************************************************************
-  Zend Engine configuration
- ****************************************************************************/
-
-@ZEND_CONFIGURATION@
-
 /*****************************************************************************
   PHP SAPIs configuration
  ****************************************************************************/
@@ -719,6 +713,12 @@
 
 @PHP_EXTENSIONS_CONFIGURATION@
 
+/*****************************************************************************
+  Zend Engine configuration
+ ****************************************************************************/
+
+@ZEND_CONFIGURATION@
+
 #if @PHP_CONFIG_H_WINDOWS@
 /* The following build system related configuration values are on *nix
    systems defined in the main/build-defs.h and JScript Windows build system

cmake/win32/CMakeLists.txt

@@ -69,6 +69,12 @@ target_compile_definitions(
     _MBCS
     _USE_MATH_DEFINES
     PHP_EXPORTS
+    # The time_t defaults to 64-bit. Force 32-bit time_t on 32-bit architecture.
+    # This was historically added to PHP as Visual Studio 2005 set 64-bit time_t
+    # by default and it would break 3rdParty libs that were built with older
+    # compilers. This and duplicate definition in the configuration header
+    # should be removed at some point.
+    $<$<EQUAL:${CMAKE_SIZEOF_VOID_P},4>:_USE_32BIT_TIME_T=1>
 )
 
 # MS deprecated ANSI stdio and similar functions. Disable warnings.
@@ -79,11 +85,6 @@ target_compile_options(
     $<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/wd4996>
 )
 
-# The time_t defaults to 64-bit. Force 32-bit time_t on 32-bit architecture.
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  target_compile_definitions(php_configuration INTERFACE _USE_32BIT_TIME_T=1)
-endif()
-
 target_link_libraries(php_win32 PRIVATE PHP::configuration)
 
 target_link_libraries(