Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit 9763e0344f7a · 2024-11-26T22:23:04.000+01:00
diff --git a/cmake/ext/pcre/CMakeLists.txt b/cmake/ext/pcre/CMakeLists.txt
@@ -77,6 +77,9 @@ target_sources(
         php_pcre.h
 )
 
+# TODO: Fix this better for OBJECT libraries, which can't handle .def files.
+set_source_files_properties(php_pcre.def PROPERTIES HEADER_FILE_ONLY TRUE)
+
 target_compile_definitions(php_pcre PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 set(PCRE2_CODE_UNIT_WIDTH 8)

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ target_sources(`
`77`	`77`	`php_pcre.h`
`78`	`78`	`)`
`79`	`79`
	`80`	`+# TODO: Fix this better for OBJECT libraries, which can't handle .def files.`
	`81`	`+set_source_files_properties(php_pcre.def PROPERTIES HEADER_FILE_ONLY TRUE)`
	`82`	`+`
`80`	`83`	`target_compile_definitions(php_pcre PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)`
`81`	`84`
`82`	`85`	`set(PCRE2_CODE_UNIT_WIDTH 8)`