Add PHP_CORE target property

Author: petk

cmake/CMakeLists.txt

@@ -57,34 +57,23 @@ target_include_directories(
 )
 
 # 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.
+# SAPIs and shared extensions. On Windows (win32 directory) there is also a
+# shared DLL created for shared extensions 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)
+target_link_libraries(
+  php_core
+  INTERFACE
+    PHP::config
+    $<$<NOT:$<PLATFORM_ID:Windows>>: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()
+target_compile_definitions(
+  php_config INTERFACE
+)
 
 ################################################################################
 # Configure project.
@@ -102,6 +91,14 @@ define_property(
   BRIEF_DOCS "Whether the PHP SAPI is FastCGI-based"
 )
 
+define_property(
+  TARGET
+  PROPERTY PHP_CORE
+  BRIEF_DOCS
+    "Whether the target should get compile properties dedicated to PHP core "
+    "objects (e.g, *_EXPORTS compile definitions, etc.)."
+)
+
 # Check whether IPO/LTO can be enabled.
 include(PHP/Optimization)
 
@@ -126,6 +123,7 @@ include(cmake/ConfigureChecks.cmake)
 # Check compilation options.
 include(cmake/Flags.cmake)
 
+add_subdirectory(win32)
 add_subdirectory(sapi)
 add_subdirectory(ext)
 add_subdirectory(Zend)
@@ -137,7 +135,6 @@ message(STATUS "===============")
 message(STATUS "")
 
 add_subdirectory(pear)
-add_subdirectory(win32)
 add_subdirectory(main)
 add_subdirectory(scripts)
 

cmake/Zend/CMakeLists.txt

@@ -327,6 +327,7 @@ set_target_properties(
     VERSION ${Zend_VERSION}
     ZEND_EXTENSION_API_NO ${Zend_VERSION_EXTENSION_API_NO}
     ZEND_MODULE_API_NO ${Zend_VERSION_MODULE_API_NO}
+    PHP_CORE TRUE
 )
 
 ################################################################################

cmake/cmake/ConfigureChecks.cmake

@@ -893,6 +893,7 @@ if(PHP_DTRACE)
       INCLUDES
         $<TARGET_PROPERTY:PHP::config,INTERFACE_INCLUDE_DIRECTORIES>
     )
+    set_target_properties(php_dtrace PROPERTIES PHP_CORE TRUE)
 
     target_link_libraries(php_config INTERFACE DTrace::DTrace)
     target_link_libraries(php_core_objects INTERFACE php_dtrace)

cmake/ext/CMakeLists.txt

@@ -81,6 +81,8 @@ foreach(extension IN LISTS extensions)
       PRIVATE $<$<PLATFORM_ID:Windows>:$<TARGET_NAME_IF_EXISTS:PHP::core>>
     )
   else()
+    set_target_properties(php_ext_${extension} PROPERTIES PHP_CORE)
+
     target_compile_definitions(
       php_config
       INTERFACE

cmake/ext/iconv/CMakeLists.txt

@@ -72,12 +72,8 @@ target_sources(
 )
 
 get_target_property(type php_ext_iconv TYPE)
-if(
-  CMAKE_SYSTEM_NAME STREQUAL "Windows"
-  AND TARGET php_core_library
-  AND NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$"
-)
-  target_sources(php_core_library PRIVATE php_iconv.def)
+if(TARGET php_windows AND type MATCHES "^(OBJECT|STATIC)_LIBRARY$")
+  target_sources(php_windows PRIVATE php_iconv.def)
 endif()
 
 target_compile_definitions(

cmake/ext/libxml/CMakeLists.txt

@@ -53,8 +53,8 @@ target_sources(
         php_libxml.h
 )
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND TARGET php_core_library)
-  target_sources(php_core_library PRIVATE php_libxml2.def)
+if(TARGET php_windows)
+  target_sources(php_windows PRIVATE php_libxml2.def)
 endif()
 
 target_compile_definitions(

cmake/ext/pcre/CMakeLists.txt

@@ -203,8 +203,8 @@ else()
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(PCRE2_STATIC TRUE)
 
-    if(TARGET php_core_library)
-      target_sources(php_core_library PRIVATE php_pcre.def)
+    if(TARGET php_windows)
+      target_sources(php_windows PRIVATE php_pcre.def)
     endif()
   endif()
 

cmake/ext/tidy/CMakeLists.txt

@@ -68,12 +68,8 @@ target_sources(
 )
 
 get_target_property(type php_ext_tidy TYPE)
-if(
-  CMAKE_SYSTEM_NAME STREQUAL "Windows"
-  AND TARGET php_core_library
-  AND NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$"
-)
-  target_sources(php_core_library PRIVATE php_tidy.def)
+if(TARGET php_windows AND type MATCHES "^(OBJECT|STATIC)_LIBRARY$")
+  target_sources(php_windows PRIVATE php_tidy.def)
 endif()
 
 # Add -Wno-ignored-qualifiers as this is an issue upstream. Fixed in tidy-html5

cmake/ext/zlib/CMakeLists.txt

@@ -67,12 +67,8 @@ target_sources(
 )
 
 get_target_property(type php_ext_zlib TYPE)
-if(
-  CMAKE_SYSTEM_NAME STREQUAL "Windows"
-  AND TARGET php_core_library
-  AND NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$"
-)
-  target_sources(php_core_library PRIVATE php_zlib.def)
+if(TARGET php_windows AND type MATCHES "^(OBJECT|STATIC)_LIBRARY$")
+  target_sources(php_windows PRIVATE php_zlib.def)
 endif()
 
 target_compile_definitions(php_ext_zlib PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)

cmake/main/CMakeLists.txt

@@ -104,6 +104,8 @@ target_sources(
         $<$<NOT:$<PLATFORM_ID:Windows>>:${PHP_BINARY_DIR}/$<CONFIG>/main/php_config.h>
 )
 
+set_target_properties(php_main PROPERTIES PHP_CORE TRUE)
+
 ################################################################################
 # Add usage requirements to PHP interface targets.
 ################################################################################
@@ -144,6 +146,11 @@ target_sources(
 
 add_library(php_main_internal_functions OBJECT internal_functions.c)
 add_library(php_main_internal_functions_cli OBJECT internal_functions_cli.c)
+set_target_properties(
+  php_main_internal_functions
+  php_main_internal_functions_cli
+  PROPERTIES PHP_CORE TRUE
+)
 
 target_sources(
   php_core_objects

cmake/win32/CMakeLists.txt

@@ -9,7 +9,7 @@ include(FeatureSummary)
 # Add library.
 ################################################################################
 
-add_library(php_windows OBJECT)
+add_library(php_windows SHARED)
 add_library(PHP::windows ALIAS php_windows)
 
 target_sources(
@@ -69,7 +69,22 @@ target_sources(
 )
 
 target_include_directories(php_windows PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(php_windows PRIVATE PHP::config)
+
+target_link_libraries(
+  php_windows
+  PRIVATE
+    PHP::config
+    PHP::core::objects
+)
+
+set_target_properties(php_windows PROPERTIES OUTPUT_NAME php)
+
+target_compile_options(
+  php_windows
+  PRIVATE
+    /nodefaultlib:libcmt
+    /d2:-AllowCompatibleILVersions
+)
 
 ################################################################################
 # Add usage requirements to PHP interface targets.
@@ -100,7 +115,7 @@ target_compile_definitions(
     _MBCS
     _USE_MATH_DEFINES
 
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:PHP_EXPORTS>
+    $<$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>: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
@@ -109,9 +124,9 @@ target_compile_definitions(
     # should be removed at some point.
     $<$<EQUAL:${CMAKE_SIZEOF_VOID_P},4>:_USE_32BIT_TIME_T=1>
 
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:WINVER=0x0602>
+    $<$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>:_USRDLL>
 
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:_USRDLL>
+    $<$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>:WINVER=0x0602>
 )
 
 target_compile_options(
@@ -129,12 +144,6 @@ target_compile_options(
     $<$<COMPILE_LANGUAGE:C,CXX>:/FD>
 )
 
-target_link_options(
-  php_config
-  INTERFACE
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY;SHARED_LIBRARY>,$<LINK_LANGUAGE:C,CXX>>:/dll>
-)
-
 target_link_libraries(
   php_config
   INTERFACE
@@ -149,8 +158,7 @@ target_link_libraries(
     ws2_32
 )
 
-target_link_libraries(php_core_objects INTERFACE PHP::windows)
-target_sources(php_core_objects INTERFACE $<TARGET_OBJECTS:PHP::windows>)
+target_link_libraries(php_core INTERFACE PHP::windows)
 
 ################################################################################
 # Generate wsyslog.h file with message compiler (mc).