commit a6fd3801644f394e92aaf309ae03f8039ed2819e
author Soby Mathew <soby.mathew@arm.com> Wed Jan 25 14:43:08 2023 +0000
committer Soby Mathew <soby.mathew@arm.com> Wed Jan 25 16:29:12 2023 +0000
tree a7fbe09753d3e91500d5eb5d4dc0612fa35cc69d
parent fe2ac1f95577558bfbe0d78bac371a0860baf83b

build: support multi config for build artefacts

Currently the rmm.elf, rmm.map, rmm.dump and rmm.img are created
in the top level `build` directory. This is a problem when using
multi config generators in Cmake. This patch modifies the artefact
path such that the build output is stored in a config specific
folder.

Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Change-Id: Ieab3bfa4b88fd168571d98ef3b041c4820c554e5

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed2b46c..9f15a88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,14 +108,25 @@
 endif()
 
 #
+# Copy 'rmm-runtime' executable to 'build/$<CONFIG>/rmm.elf'.
+#
+
+set(ARTEFACT_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>")
+add_custom_command(
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${ARTEFACT_DIR}"
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:rmm-runtime>" "${ARTEFACT_DIR}/rmm.elf"
+    OUTPUT rmm.elf
+    DEPENDS rmm-runtime)
+
+#
 # Create the flat binary using whatever tool comes with the toolchain.
 #
 
 if(CMAKE_OBJCOPY)
     add_custom_command(
-        COMMAND "${CMAKE_OBJCOPY}" -O binary "$<TARGET_FILE:rmm-runtime>" rmm.img
+        COMMAND "${CMAKE_OBJCOPY}" -O binary "${ARTEFACT_DIR}/rmm.elf" "${ARTEFACT_DIR}/rmm.img"
         OUTPUT rmm.img
-        DEPENDS rmm-runtime)
+        DEPENDS rmm.elf)
 endif()
 
 #
@@ -124,26 +135,17 @@
 
 if(CMAKE_OBJDUMP)
     add_custom_command(
-        COMMAND "${CMAKE_OBJDUMP}" -dx "$<TARGET_FILE:rmm-runtime>" > rmm.dump
+        COMMAND "${CMAKE_OBJDUMP}" -dx "${ARTEFACT_DIR}/rmm.elf" > "${ARTEFACT_DIR}/rmm.dump"
         OUTPUT rmm.dump
-        DEPENDS rmm-runtime)
+        DEPENDS rmm.elf)
 endif()
 
 #
-# Copy 'rmm-runtime' executable to 'build\rmm.elf'.
+# Copy 'rmm-runtime.map' to 'build/$<CONFIG>/rmm.map'
 #
 
 add_custom_command(
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:rmm-runtime>" rmm.elf
-    OUTPUT rmm.elf
-    DEPENDS rmm-runtime)
-
-#
-# Copy 'rmm-runtime.map' to 'build\rmm.map'
-#
-
-add_custom_command(
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:rmm-runtime>.map" rmm.map
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:rmm-runtime>.map" "${ARTEFACT_DIR}/rmm.map"
     OUTPUT rmm.map
     DEPENDS rmm-runtime)