Fix TSRM linking

This now properly links the TSRM into Zend Engine.

Instead of adding TSRM subdirectory in the project root, it adds it as
part of the Zend Engine configuration. TSRM objects and compile options
are then transitively passed to further targets as needed.

Author: petk

cmake/CMakeLists.txt

@@ -36,7 +36,6 @@ message(STATUS "Configuring PHP")
 message(STATUS "---------------\n")
 
 add_subdirectory(pear)
-add_subdirectory(TSRM)
 add_subdirectory(win32)
 add_subdirectory(main)
 add_subdirectory(scripts)

cmake/TSRM/CMakeLists.txt

@@ -1,8 +1,24 @@
-add_library(php_tsrm OBJECT)
-add_library(PHP::TSRM ALIAS php_tsrm)
+#[=============================================================================[
+TSRM (Thread Safe Resource Manager) is a separate directory in php-src as it was
+once a standalone project. Ideally, it should be integrated into Zend Engine.
+
+The TSRM::TSRM target is used to transitively pass the TSRM object(s) and
+compile options to Zend Engine, which propagates it further as needed.
+#]=============================================================================]
+
+add_library(tsrm_object OBJECT)
+add_library(tsrm INTERFACE)
+add_library(TSRM::TSRM ALIAS tsrm)
+
+target_link_libraries(
+  tsrm
+  INTERFACE
+    tsrm_object
+    $<TARGET_OBJECTS:tsrm_object>
+)
 
 target_sources(
-  php_tsrm
+  tsrm_object
   PRIVATE
     $<$<PLATFORM_ID:Windows>:tsrm_win32.c>
     TSRM.c
@@ -13,23 +29,25 @@ target_sources(
         TSRM.h
 )
 
-target_link_libraries(php_tsrm PRIVATE PHP::configuration)
+target_link_libraries(tsrm_object PRIVATE PHP::configuration)
 
-target_include_directories(php_tsrm INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+  tsrm_object
+  INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM>
+)
 
 target_compile_definitions(
-  php_tsrm
+  tsrm_object
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+  PUBLIC
     $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>
-  INTERFACE
-    # Pass transitively only to Zend::Zend library on Windows.
-    $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:NAME>,zend>,$<PLATFORM_ID:Windows>>:TSRM_EXPORTS>
 )
 
 install(
-  TARGETS php_tsrm
-  ARCHIVE EXCLUDE_FROM_ALL
+  TARGETS tsrm_object
   FILE_SET HEADERS
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM
 )

cmake/Zend/CMakeLists.txt

@@ -304,13 +304,15 @@ target_sources(
         $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_BINARY_DIR}/zend_config.h>
 )
 
+# Add TSRM.
+add_subdirectory(../TSRM ../TSRM)
+
 target_link_libraries(
   zend
   PRIVATE
     PHP::configuration
   PUBLIC
-    PHP::TSRM
-    $<TARGET_OBJECTS:PHP::TSRM>
+    TSRM::TSRM
 )
 
 target_include_directories(
@@ -324,6 +326,7 @@ target_compile_definitions(
   zend
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+  PUBLIC
     $<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
 )