Fix shared extensions on Windows

This now enables building shared extensions also on Windows.

Author: petk

cmake/CMakeLists.txt

@@ -56,10 +56,35 @@ target_include_directories(
     ${PHP_SOURCE_DIR}
 )
 
-# Interface library that ties objects and configuration together for PHP SAPIs.
-add_library(php_sapi INTERFACE)
-add_library(PHP::sapi ALIAS php_sapi)
-target_link_libraries(php_sapi INTERFACE PHP::config)
+# Create PHP core library that ties objects and configuration together for PHP
+# SAPIs and shared extensions. On Windows there is also a standalone shared DLL
+# created for shared extensions which need it linked to have symbols available.
+add_library(php_core INTERFACE)
+add_library(PHP::core ALIAS php_core)
+
+add_library(php_core_objects INTERFACE)
+add_library(PHP::core::objects ALIAS php_core_objects)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  add_library(php_core_library SHARED)
+  add_library(PHP::core::library ALIAS php_core_library)
+  target_link_libraries(
+    php_core_library
+    PRIVATE
+      PHP::config
+      PHP::core::objects
+  )
+  target_compile_options(
+    php_core_library
+    PRIVATE
+      /nodefaultlib:libcmt
+      /d2:-AllowCompatibleILVersions
+  )
+
+  target_link_libraries(php_core INTERFACE PHP::config PHP::core::library)
+else()
+  target_link_libraries(php_core INTERFACE PHP::config PHP::core::objects)
+endif()
 
 ################################################################################
 # Configure project.

cmake/Zend/CMakeLists.txt

@@ -318,7 +318,7 @@ target_compile_definitions(
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE
   PUBLIC
-    $<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
+    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:LIBZEND_EXPORTS>
 )
 
 set_target_properties(
@@ -334,8 +334,8 @@ set_target_properties(
 ################################################################################
 
 target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
-target_link_libraries(php_sapi INTERFACE Zend::Zend)
-target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
+target_link_libraries(php_core_objects INTERFACE Zend::Zend)
+target_sources(php_core_objects INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
 
 ################################################################################
 # TSRM (Thread Safe Resource Manager) is a separate directory in php-src as it
@@ -364,7 +364,11 @@ target_include_directories(
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM>
 )
 
-target_compile_definitions(zend PUBLIC $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>)
+target_compile_definitions(
+  zend
+  PUBLIC
+    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:TSRM_EXPORTS>
+)
 
 install(
   TARGETS zend

cmake/cmake/ConfigureChecks.cmake

@@ -854,7 +854,7 @@ if(PHP_DTRACE)
     )
 
     target_link_libraries(php_config INTERFACE DTrace::DTrace)
-    target_link_libraries(php_sapi INTERFACE php_dtrace)
+    target_link_libraries(php_core_objects INTERFACE php_dtrace)
 
     set(HAVE_DTRACE TRUE)
   endif()

cmake/cmake/modules/PHP/Extensions.cmake

@@ -431,6 +431,14 @@ function(php_extensions_postconfigure extension)
     set_property(TARGET php_ext_${extension} PROPERTY OUTPUT_NAME ${extension})
   endif()
 
+  # Set target output filename prefix "[<prefix>]<extension>".
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    get_target_property(prefix php_ext_${extension} PREFIX)
+    if(NOT prefix)
+      set_property(TARGET php_ext_${extension} PROPERTY PREFIX "php_")
+    endif()
+  endif()
+
   # Specify extension's default installation rules.
   get_target_property(sets php_ext_${extension} INTERFACE_HEADER_SETS)
   set(fileSets "")