Skip to content

Commit 13e5453

Browse files
authored
Merge pull request #15 from Shatur/escape-lists
Fix add_custom_command OUTPUT paths
2 parents 30985e0 + d9eb01f commit 13e5453

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

CMakeLists.txt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,21 +143,12 @@ else()
143143
endif()
144144

145145
message(STATUS "Generating Bindings")
146-
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True)"
146+
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True, sources=True)"
147147
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
148-
RESULT_VARIABLE HEADERS_FILE_LIST_RESULT
149-
OUTPUT_VARIABLE HEADERS_FILE_LIST
148+
OUTPUT_VARIABLE GENERATED_FILES_LIST
150149
)
151-
set(HEADERS_FILE_LIST ${HEADERS_FILE_LIST})
152150

153-
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", sources=True)"
154-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
155-
RESULT_VARIABLE SOURCES_FILE_LIST_RESULT
156-
OUTPUT_VARIABLE SOURCES_FILE_LIST
157-
)
158-
set(SOURCES_FILE_LIST ${SOURCES_FILE_LIST})
159-
160-
add_custom_command(OUTPUT ${HEADERS_FILE_LIST} ${SOURCES_FILE_LIST}
151+
add_custom_command(OUTPUT ${GENERATED_FILES_LIST}
161152
COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${CMAKE_CURRENT_BINARY_DIR}\")"
162153
VERBATIM
163154
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -173,9 +164,8 @@ file(GLOB_RECURSE HEADERS include/*.h**)
173164
# Define our godot-cpp library
174165
add_library(${PROJECT_NAME}
175166
${SOURCES}
176-
${SOURCES_FILE_LIST}
177167
${HEADERS}
178-
${HEADERS_FILE_LIST}
168+
${GENERATED_FILES_LIST}
179169
)
180170
target_include_directories(${PROJECT_NAME}
181171
PUBLIC

0 commit comments

Comments
 (0)