Skip to content

Commit 49d6349

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents f27b09d + dec2083 commit 49d6349

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

cmake/main/CMakeLists.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -315,19 +315,16 @@ function(_php_main_create_files)
315315
set(file config.w32.h)
316316
else()
317317
message(STATUS "Creating main/build-defs.h")
318-
configure_file(
319-
main/build-defs.h.in
320-
main/CMakeFiles/build-defs.h.in
321-
@ONLY
322-
)
318+
file(READ main/build-defs.h.in content)
319+
string(CONFIGURE "${content}" content @ONLY)
323320

324321
# To be able to evaluate the generator expressions.
325322
file(
326323
GENERATE
327324
# TODO: Multi-config generators need to write separate files.
328325
#OUTPUT $<CONFIG>/main/build-defs.h
329326
OUTPUT ${PHP_BINARY_DIR}/main/build-defs.h
330-
INPUT ${PHP_BINARY_DIR}/main/CMakeFiles/build-defs.h.in
327+
CONTENT "${content}"
331328
)
332329

333330
set(HAVE_BUILD_DEFS_H 1)
@@ -336,18 +333,15 @@ function(_php_main_create_files)
336333
endif()
337334

338335
message(STATUS "Creating main/${file}")
339-
configure_file(
340-
main/php_config.cmake.h.in
341-
main/CMakeFiles/${file}.cmake.in
342-
@ONLY
343-
)
336+
file(READ main/php_config.cmake.h.in content)
337+
string(CONFIGURE "${content}" content @ONLY)
344338

345339
file(
346340
GENERATE
347341
# TODO: Multi-config generators need to write separate files.
348342
#OUTPUT $<CONFIG>/main/${file}
349343
OUTPUT ${PHP_BINARY_DIR}/main/${file}
350-
INPUT ${PHP_BINARY_DIR}/main/CMakeFiles/${file}.cmake.in
344+
CONTENT "${content}"
351345
)
352346
endfunction()
353347

0 commit comments

Comments
 (0)