2
0
Эх сурвалжийг харах

Merge pull request #1307 from LAK132/master

Fix file list issues when trying to build with meson via cmake
Rémi Verschelde 1 жил өмнө
parent
commit
4fed88afcf

+ 1 - 0
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)"
 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}
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	OUTPUT_VARIABLE GENERATED_FILES_LIST
 	OUTPUT_VARIABLE GENERATED_FILES_LIST
+	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 )
 
 
 add_custom_command(OUTPUT ${GENERATED_FILES_LIST}
 add_custom_command(OUTPUT ${GENERATED_FILES_LIST}

+ 1 - 3
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):
 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):
 def scons_emit_files(target, source, env):