Fix php_stubs target name collision with php_stubs directory name

Creating custom files and directories inside CMakeFiles must be done
really carefully otherwise target collisions happen if target name has
the same name as some directory inside CMakeFiles.

Author: petk

cmake/cmake/modules/PHP/Stubs.cmake

@@ -93,7 +93,7 @@ endif()
 file(
   COPY
   ${PROJECT_SOURCE_DIR}/build/gen_stub.php
-  DESTINATION ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs
+  DESTINATION ${PROJECT_BINARY_DIR}/CMakeFiles/PHP/Stubs
 )
 
 block()
@@ -119,11 +119,11 @@ block()
   endforeach()
 
   set(PHP_SOURCES "$<JOIN:$<REMOVE_DUPLICATES:${stubs}>,$<SEMICOLON>>")
-  file(READ ${CMAKE_CURRENT_LIST_DIR}/Stubs/PHPStubsGenerator.cmake.in content)
+  file(READ ${CMAKE_CURRENT_LIST_DIR}/Stubs/StubsGenerator.cmake.in content)
   string(CONFIGURE "${content}" content @ONLY)
   file(
     GENERATE
-    OUTPUT ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs/PHPStubsGenerator.cmake
+    OUTPUT ${PROJECT_BINARY_DIR}/CMakeFiles/PHP/Stubs/StubsGenerator.cmake
     CONTENT "${content}"
   )
 
@@ -136,7 +136,8 @@ block()
     php_stubs ${targetOptions}
     COMMAND
       ${CMAKE_COMMAND}
-      -P ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs/PHPStubsGenerator.cmake
+      -P ${PROJECT_BINARY_DIR}/CMakeFiles/PHP/Stubs/StubsGenerator.cmake
     VERBATIM
+    COMMAND_EXPAND_LISTS
   )
 endblock()

cmake/cmake/modules/PHP/Stubs/PHPStubsGenerator.cmake.in renamed to cmake/cmake/modules/PHP/Stubs/StubsGenerator.cmake.in

@@ -7,17 +7,15 @@ if(NOT CMAKE_SCRIPT_MODE_FILE)
 endif()
 
 set(sources "@PHP_SOURCES@")
+set(phpCommand "@PHP_COMMAND@")
+set(phpGenStubScriptSource "@PROJECT_SOURCE_DIR@/build/gen_stub.php")
 
 # Ensure sources include only *.stub.php files.
 list(FILTER sources INCLUDE REGEX [[\.stub\.php$]])
 
 # Create a list of sources that must be parsed by the generator.
-if(@PROJECT_SOURCE_DIR@/build/gen_stub.php IS_NEWER_THAN ${CMAKE_CURRENT_LIST_FILE})
-  file(
-    COPY
-    @PROJECT_SOURCE_DIR@/build/gen_stub.php
-    DESTINATION @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs
-  )
+if(${phpGenStubScriptSource} IS_NEWER_THAN ${CMAKE_CURRENT_LIST_FILE})
+  file(COPY ${phpGenStubScriptSource} DESTINATION ${CMAKE_CURRENT_LIST_DIR})
   set(stubs ${sources})
   file(TOUCH ${CMAKE_CURRENT_LIST_FILE})
 else()
@@ -35,15 +33,10 @@ endif()
 
 execute_process(
   COMMAND
-    ${CMAKE_COMMAND}
-    -E cmake_echo_color --blue --bold
-    "Regenerating *_arginfo.h headers from *.stub.php sources"
-)
-
-execute_process(
+    ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold
+      "Regenerating *_arginfo.h headers from *.stub.php sources"
   COMMAND
-    @PHP_COMMAND@ @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs/gen_stub.php
-    ${stubs}
+    ${phpCommand} ${CMAKE_CURRENT_LIST_DIR}/gen_stub.php ${stubs}
 )
 
 # Ensure that *_arginfo.h headers are newer than their *.stub.php sources.