Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Avoid some uses of the LOCATION target property. CORE-14509

Browse source
This commit is contained in:
Thomas Faber 2018-03-10 14:41:13 +01:00
parent 96c0f7d341
commit f6dea8b734
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
boot/freeldr/freeldr/CMakeLists.txt
View file

@ -268,17 +268,14 @@ endif()
add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe asm)
add_dependencies(freeldr_pe_dbg asm) add_dependencies(freeldr_pe_dbg asm)
# Retrieve the full path to the generated file of the 'freeldr_pe' target
get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION)
if(NOT ARCH STREQUAL "arm") if(NOT ARCH STREQUAL "arm")
concatenate_files( concatenate_files(
${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
${_freeldr_pe_output_file}) ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
else() else()
add_custom_target(freeldr ALL DEPENDS ${_freeldr_pe_output_file}) add_custom_target(freeldr ALL DEPENDS freeldr_pe)
endif() endif()
# rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys # rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys
@ -289,10 +286,10 @@ if(NOT ARCH STREQUAL "arm")
concatenate_files( concatenate_files(
${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
${_freeldr_pe_output_file}) ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
else() else()
add_custom_target(setupldr ALL DEPENDS ${_freeldr_pe_output_file}) add_custom_target(setupldr ALL DEPENDS freeldr_pe)
endif() endif()
add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)

4
sdk/include/asm/CMakeLists.txt
View file

@ -18,11 +18,9 @@ elseif(ARCH STREQUAL "arm")
set(_filename ksarm.h) set(_filename ksarm.h)
endif() endif()
get_target_property(genincdata_dll genincdata LOCATION)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename} OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename}
COMMAND native-geninc ${genincdata_dll} ${CMAKE_CURRENT_BINARY_DIR}/${_filename} ${OPT_MS} COMMAND native-geninc $<TARGET_FILE:genincdata> ${CMAKE_CURRENT_BINARY_DIR}/${_filename} ${OPT_MS}
DEPENDS genincdata native-geninc) DEPENDS genincdata native-geninc)
add_custom_target(asm add_custom_target(asm