Skip to content

Commit d5af808

Browse files
committed
[FREELDR]
In a quest to better registry, don't break VSSolution builds. freeldr_pe is not in the same directory and copy doesn't care if you ask to concatenate C:\tomatoes, it already has the first file. svn path=/trunk/; revision=67053
1 parent a91d1b6 commit d5af808

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

reactos/boot/freeldr/freeldr/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,13 @@ endif()
226226
add_dependencies(freeldr_pe asm)
227227
add_dependencies(freeldr_pe_dbg asm)
228228

229+
# Retrieve the full path to the generated file of the 'freeldr_pe' target
230+
get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION)
231+
229232
concatenate_files(
230233
${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
231234
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
232-
${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
235+
${_freeldr_pe_output_file})
233236

234237
add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
235238

@@ -240,7 +243,8 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINAT
240243
concatenate_files(
241244
${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
242245
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
243-
${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
246+
${_freeldr_pe_output_file})
244247

245248
add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
246249
add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
250+

0 commit comments

Comments
 (0)