Skip to content

Commit 8f3ca8a

Browse files
Small CMake cross compilation fix for Ninja
Fixes issue with multiple defined outputs for gen_defines.asm, and uses more idiomatic patterns for generated files.
1 parent 6df8690 commit 8f3ca8a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

loader/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,9 @@ end
228228

229229
find_package(Python3 REQUIRED QUIET)
230230
# Run parse_asm_values.py on asm_offset's assembly file to generate the gen_defines.asm, which the asm code depends on
231-
add_custom_command(TARGET asm_offset POST_BUILD
231+
add_custom_command(OUTPUT gen_defines.asm
232232
COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/scripts/parse_asm_values.py "${CMAKE_CURRENT_BINARY_DIR}/gen_defines.asm"
233233
"$<TARGET_FILE_DIR:asm_offset>/asm_offset.asm" "${LOADER_ASM_DIALECT}" "${CMAKE_C_COMPILER_ID}" "${SYSTEM_PROCESSOR}"
234-
BYPRODUCTS gen_defines.asm
235234
)
236235
endif()
237236
add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)
@@ -338,11 +337,9 @@ elseif(UNIX OR MINGW OR (WIN32 AND USE_GAS)) # i.e.: Linux & Apple & MinGW & Win
338337

339338
find_package(Python3 REQUIRED QUIET)
340339
# Run parse_asm_values.py on asm_offset's assembly file to generate the gen_defines.asm, which the asm code depends on
341-
add_custom_target(gen_defines.asm
342-
DEPENDS asm_offset
340+
add_custom_command(OUTPUT gen_defines.asm
343341
COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/scripts/parse_asm_values.py "${ASM_OFFSET_EXECUTABLE_LOCATION}"
344342
"${ASM_OFFSET_INTERMEDIATE_LOCATION}" "GAS" "${CMAKE_C_COMPILER_ID}" "${ASM_OFFSET_SYSTEM_PROCESSOR}"
345-
BYPRODUCTS gen_defines.asm
346343
)
347344
endif()
348345
add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm)

0 commit comments

Comments
 (0)