@@ -310,8 +310,6 @@ block()
310310 continue ()
311311 endif ()
312312
313- get_target_property (isCli php_${extension} PHP_CLI)
314-
315313 file (GLOB_RECURSE headers ${PHP_SOURCE_DIR} /ext /${extension} /*.h)
316314
317315 foreach (header IN LISTS headers)
@@ -322,17 +320,13 @@ block()
322320 cmake_path(GET header FILENAME filename)
323321 set (code "#include \" ext/${extension} /${filename} \"\n " )
324322 string (APPEND includesCli "${code} " )
325- if (NOT isCli)
326- string (APPEND includes "${code} " )
327- endif ()
323+ string (APPEND includes "$<$<NOT:$<BOOL:$<TARGET_GENEX_EVAL:PHP::${extension} ,$<TARGET_PROPERTY:PHP::${extension} ,PHP_CLI>>>>:${code} >" )
328324 endif ()
329325 endforeach ()
330326
331327 set (code "\n\t phpext_${extension} _ptr," )
332328 set (pointersCli "${pointersCli}${code} " )
333- if (NOT isCli)
334- set (pointers "${pointers}${code} " )
335- endif ()
329+ set (pointers "${pointers} $<$<NOT:$<BOOL:$<TARGET_GENEX_EVAL:PHP::${extension} ,$<TARGET_PROPERTY:PHP::${extension} ,PHP_CLI>>>>:${code} >" )
336330 endforeach ()
337331
338332 cmake_path(
@@ -342,15 +336,19 @@ block()
342336 OUTPUT_VARIABLE relativeBinaryDir
343337 )
344338
339+ file (READ internal_functions.c.in template)
340+
341+ message (STATUS "Configuring ${relativeBinaryDir} /internal_functions.c" )
345342 set (EXT_INCLUDE_CODE "${includes} " )
346343 set (EXT_MODULE_PTRS "${pointers} " )
347- message ( STATUS "Creating ${relativeBinaryDir} /internal_functions.c" )
348- configure_file (internal_functions.c.in internal_functions.c)
344+ string (CONFIGURE " ${template} " content )
345+ file (GENERATE OUTPUT internal_functions.c CONTENT " ${content} " )
349346
347+ message (STATUS "Configuring ${relativeBinaryDir} /internal_functions_cli.c" )
350348 set (EXT_INCLUDE_CODE "${includesCli} " )
351349 set (EXT_MODULE_PTRS "${pointersCli} " )
352- message ( STATUS "Creating ${relativeBinaryDir} /internal_functions_cli.c" )
353- configure_file (internal_functions.c.in internal_functions_cli.c)
350+ string (CONFIGURE " ${template} " content )
351+ file (GENERATE OUTPUT internal_functions_cli.c CONTENT " ${content} " )
354352endblock()
355353
356354################################################################################
0 commit comments