Skip to content

Commit d98c373

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 2513272 + 6225d94 commit d98c373

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cmake/Zend/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ target_sources(
209209
zend_closures_arginfo.h
210210
zend_closures.h
211211
zend_compile.h
212-
$<$<PLATFORM_ID:Windows>:zend_config.w32.h>
212+
$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/zend_config.w32.h>
213213
zend_constants_arginfo.h
214214
zend_constants.h
215215
zend_cpuinfo.h

cmake/ext/mysqlnd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ target_sources(
132132
PUBLIC
133133
FILE_SET HEADERS
134134
FILES
135-
$<$<PLATFORM_ID:Windows>:config-win.h>
135+
$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/config-win.h>
136136
mysql_float_to_double.h
137137
mysqlnd_alloc.h
138138
mysqlnd_auth.h

cmake/ext/sockets/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ target_sources(
7474
FILE_SET HEADERS
7575
FILES
7676
php_sockets.h
77-
$<$<PLATFORM_ID:Windows>:windows_common.h>
77+
$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/windows_common.h>
7878
)
7979

8080
target_compile_definitions(

cmake/ext/standard/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ target_sources(
199199
url_scanner_ex.h
200200
url.h
201201
user_filters_arginfo.h
202-
$<$<PLATFORM_ID:Windows>:winver.h>
202+
$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/winver.h>
203203
)
204204

205205
# Check for ARM64 processor on Windows.

0 commit comments

Comments
 (0)