summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLAK132 <lakridesagain@gmail.com>2023-11-11 23:29:33 +1030
committerLAK132 <lakridesagain@gmail.com>2023-11-11 23:29:33 +1030
commit39c139c8143d3dfb1595ea812f1cf0c08ef9b4fe (patch)
treeacb53c8004ad761ac0352f79aa8513bd8ae85b39
parent73757e3a9fe652fa800f72f727faa8107aa1e736 (diff)
downloadredot-cpp-39c139c8143d3dfb1595ea812f1cf0c08ef9b4fe.tar.gz
Fix file list issues when trying to build with meson via cmake
-rw-r--r--CMakeLists.txt1
-rw-r--r--binding_generator.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fe8638..6262fb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,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
index eb201ff..ed7a8d4 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -136,9 +136,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):