Skip to content

Commit 39c139c

Browse files
committed
Fix file list issues when trying to build with meson via cmake
1 parent 73757e3 commit 39c139c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ endif()
134134
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)"
135135
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
136136
OUTPUT_VARIABLE GENERATED_FILES_LIST
137+
OUTPUT_STRIP_TRAILING_WHITESPACE
137138
)
138139

139140
add_custom_command(OUTPUT ${GENERATED_FILES_LIST}

binding_generator.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
136136

137137

138138
def print_file_list(api_filepath, output_dir, headers=False, sources=False):
139-
end = ";"
140-
for f in get_file_list(api_filepath, output_dir, headers, sources):
141-
print(f, end=end)
139+
print(*get_file_list(api_filepath, output_dir, headers, sources), sep=";", end=None)
142140

143141

144142
def scons_emit_files(target, source, env):

0 commit comments

Comments
 (0)