Merge pull request #1307 from LAK132/master

akien-mga · akien-mga · commit 4fed88afcfa9 · 2023-11-24T12:35:29.000+01:00
Fix file list issues when trying to build with meson via cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,6 +132,7 @@ endif()
 execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_GDEXTENSION_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True, sources=True)"
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	OUTPUT_VARIABLE GENERATED_FILES_LIST
+	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 add_custom_command(OUTPUT ${GENERATED_FILES_LIST}
diff --git a/binding_generator.py b/binding_generator.py
@@ -138,9 +138,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
 
 
 def print_file_list(api_filepath, output_dir, headers=False, sources=False):
-    end = ";"
-    for f in get_file_list(api_filepath, output_dir, headers, sources):
-        print(f, end=end)
+    print(*get_file_list(api_filepath, output_dir, headers, sources), sep=";", end=None)
 
 
 def scons_emit_files(target, source, env):

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ endif()`
`132`	`132`	`execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_GDEXTENSION_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True, sources=True)"`
`133`	`133`	`WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}`
`134`	`134`	`OUTPUT_VARIABLE GENERATED_FILES_LIST`
	`135`	`+ OUTPUT_STRIP_TRAILING_WHITESPACE`
`135`	`136`	`)`
`136`	`137`
`137`	`138`	`add_custom_command(OUTPUT ${GENERATED_FILES_LIST}`