Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/CMakeLists.txt

@@ -14,13 +14,38 @@ project(
   VERSION ${PHP_VERSION}
   DESCRIPTION "Widely-used general-purpose scripting language"
   HOMEPAGE_URL "https://www.php.net"
-  LANGUAGES C ASM
+  LANGUAGES C
 )
 
+################################################################################
+# Configure languages.
+################################################################################
+
+# Optionally enable C++ language for PHP extensions.
+include(CheckLanguage)
+check_language(CXX)
+if(CMAKE_CXX_COMPILER)
+  enable_language(CXX)
+endif()
+
+# Enable Assembly language dialect.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ARM")
+    enable_language(ASM_MARMASM)
+  else()
+    enable_language(ASM_MASM)
+  endif()
+else()
+  enable_language(ASM)
+endif()
+
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
+################################################################################
 # Configure project.
+################################################################################
+
 include(cmake/Bootstrap.cmake)
 
 add_subdirectory(sapi)

cmake/Zend/CMakeLists.txt

@@ -42,9 +42,20 @@ project(
   Zend
   VERSION ${Zend_VERSION}
   DESCRIPTION "Zend Engine library"
-  LANGUAGES C ASM
+  LANGUAGES C
 )
 
+# Enable Assembly language dialect.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ARM")
+    enable_language(ASM_MARMASM)
+  else()
+    enable_language(ASM_MASM)
+  endif()
+else()
+  enable_language(ASM)
+endif()
+
 include(CheckIncludeFiles)
 include(CheckSourceCompiles)
 include(CheckSymbolExists)

cmake/cmake/Bootstrap.cmake

@@ -16,13 +16,6 @@ define_property(
   BRIEF_DOCS "Whether the PHP SAPI is FastCGI-based"
 )
 
-# Optionally enable CXX for extensions.
-include(CheckLanguage)
-check_language(CXX)
-if(CMAKE_CXX_COMPILER)
-  enable_language(CXX)
-endif()
-
 # Check whether IPO/LTO can be enabled.
 include(PHP/Optimization)
 

cmake/win32/CMakeLists.txt

@@ -36,6 +36,7 @@ target_sources(
     wsyslog.c
   PUBLIC
     FILE_SET HEADERS
+      BASE_DIRS ${PHP_SOURCE_DIR}
       FILES
         codepage.h
         console.h
@@ -60,7 +61,7 @@ target_sources(
   PUBLIC
     FILE_SET generated
       TYPE HEADERS
-      BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
+      BASE_DIRS ${PHP_BINARY_DIR}
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/wsyslog.h
 )
@@ -189,7 +190,7 @@ install(
   TARGETS php_windows
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/win32
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}
   FILE_SET generated
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/win32
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}
 )