[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

diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt
index 1ea2aaf..23c114c 100644 (file)
--- a/reactos/boot/freeldr/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt
@@ -226,10 +226,13 @@ endif()
 add_dependencies(freeldr_pe 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)
+
 concatenate_files(
     ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
     ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-    ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
+    ${_freeldr_pe_output_file})
 
 add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
 
@@ -240,7 +243,8 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINAT
 concatenate_files(
     ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
     ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-    ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
+    ${_freeldr_pe_output_file})
 
 add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
 add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
+