Fix *_EXPORTS definitions

petk · petk · commit 736a57e37715 · 2025-07-01T08:02:04.000+02:00
diff --git a/cmake/Zend/CMakeLists.txt b/cmake/Zend/CMakeLists.txt
@@ -318,7 +318,7 @@ target_compile_definitions(
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE
   PUBLIC
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:LIBZEND_EXPORTS>
+    $<$<AND:$<PLATFORM_ID:Windows>,$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>>:LIBZEND_EXPORTS>
 )
 
 set_target_properties(
@@ -368,7 +368,7 @@ target_include_directories(
 target_compile_definitions(
   zend
   PUBLIC
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:TSRM_EXPORTS>
+    $<$<AND:$<PLATFORM_ID:Windows>,$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>>:TSRM_EXPORTS>
 )
 
 install(
diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt
@@ -113,7 +113,7 @@ set_target_properties(php_main PROPERTIES PHP_CORE TRUE)
 target_compile_definitions(
   php_config
   INTERFACE
-    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:SAPI_EXPORTS>
+    $<$<AND:$<PLATFORM_ID:Windows>,$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>>:SAPI_EXPORTS>
 )
 
 target_include_directories(

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ set_target_properties(php_main PROPERTIES PHP_CORE TRUE)`
`113`	`113`	`target_compile_definitions(`
`114`	`114`	`php_config`
`115`	`115`	`INTERFACE`
`116`		`- $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:TYPE>,OBJECT_LIBRARY;STATIC_LIBRARY>>:SAPI_EXPORTS>`
	`116`	`+ $<$<AND:$<PLATFORM_ID:Windows>,$<BOOL:$<TARGET_PROPERTY:PHP_CORE>>>:SAPI_EXPORTS>`
`117`	`117`	`)`
`118`	`118`
`119`	`119`	`target_include_directories(`