01/01: [CMAKE] Use configuration-specific names for files generated by CMake.

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a0e6540278569bd7c594…

commit 3a0e6540278569bd7c594d5687b565c9e32f6047
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sun Apr 8 18:31:27 2018 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sun Apr 8 18:31:36 2018 +0200

    [CMAKE] Use configuration-specific names for files generated by CMake.
    
    Fixes configuring with VSSolution.
---
 boot/CMakeLists.txt                   | 8 ++++----
 boot/bootdata/packages/CMakeLists.txt | 6 +++---
 sdk/cmake/CMakeMacros.cmake           | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 1828e0ba5a..0bff234030 100644
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -67,7 +67,7 @@ add_custom_target(bootcd
         -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid
${ISO_VOLNAME} -volset ${ISO_VOLNAME}
         -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4
-eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot
-hide boot.catalog
         -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort
-        -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst
+        -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst
     COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso
     DEPENDS isombr native-isohybrid native-mkisofs
     VERBATIM)
@@ -82,7 +82,7 @@ add_custom_target(bootcdregtest
         -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid
${ISO_VOLNAME} -volset ${ISO_VOLNAME}
         -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4
-eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot
-hide boot.catalog
         -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort
-        -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst
+        -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst
     COMMAND native-isohybrid -b ${_isombr_file} -t 0x96
${REACTOS_BINARY_DIR}/bootcdregtest.iso
     DEPENDS isombr native-isohybrid native-mkisofs
     VERBATIM)
@@ -126,7 +126,7 @@ add_custom_target(livecd
         -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid
${ISO_VOLNAME} -volset ${ISO_VOLNAME}
         -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4
-eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot
-hide boot.catalog
         -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort
-        -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst
+        -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst
     COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso
     DEPENDS isombr native-isohybrid native-mkisofs
     VERBATIM)
@@ -170,7 +170,7 @@ add_custom_target(hybridcd
         -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid
${ISO_VOLNAME} -volset ${ISO_VOLNAME}
         -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4
-eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot
-hide boot.catalog
         -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort
-        -duplicates-once -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst
+        -duplicates-once -no-cache-inodes -graft-points -path-list
${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst
     COMMAND native-isohybrid -b ${_isombr_file} -t 0x96
${REACTOS_BINARY_DIR}/hybridcd.iso
     DEPENDS bootcd livecd
     VERBATIM)
diff --git a/boot/bootdata/packages/CMakeLists.txt
b/boot/bootdata/packages/CMakeLists.txt
index 78db7ec536..a6199199f2 100644
--- a/boot/bootdata/packages/CMakeLists.txt
+++ b/boot/bootdata/packages/CMakeLists.txt
@@ -19,7 +19,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.cmake "")
 
 # This generates reactos.dff.dyn by processing the generator expressions
 file(GENERATE
-     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
+     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn
      INPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.cmake)
 
 # This finalizes reactos.dff by concat-ing the two files: one generated and one static
containing the optional file.
@@ -28,14 +28,14 @@ file(GENERATE
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
     COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
-                             -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
+                             -D
SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn
                              -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
                              -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake
     COMMAND ${CMAKE_COMMAND} -E copy_if_different 
                              ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
                              ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn)
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn)
 
 add_custom_target(
     reactos_cab_inf
diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 020ccc47ad..5f622e04e8 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -458,7 +458,7 @@ function(create_iso_lists)
     file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst "${_filelist}")
     unset(_filelist)
     file(GENERATE
-         OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.lst
+         OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.$<CONFIG>.lst
          INPUT ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst)
 
     get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST)
@@ -466,7 +466,7 @@ function(create_iso_lists)
     file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst "${_filelist}")
     unset(_filelist)
     file(GENERATE
-         OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.lst
+         OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.$<CONFIG>.lst
          INPUT ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst)
 
     get_property(_filelist GLOBAL PROPERTY HYBRIDCD_FILE_LIST)
@@ -474,7 +474,7 @@ function(create_iso_lists)
     file(APPEND ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst "${_filelist}")
     unset(_filelist)
     file(GENERATE
-         OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.lst
+         OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.$<CONFIG>.lst
          INPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst)
 
     get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST)
@@ -482,7 +482,7 @@ function(create_iso_lists)
     file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst
"${_filelist}")
     unset(_filelist)
     file(GENERATE
-         OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.lst
+         OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.$<CONFIG>.lst
          INPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst)
 endfunction()