From 310d3c338a2603ea7a1d7f852d74e6f614dd1051 Mon Sep 17 00:00:00 2001
From: Korbo <korbin.m.marshall@gmail.com>
Date: Mon, 7 Jul 2025 17:58:59 -0500
Subject: [PATCH] split makerom and bannertool commands, fix make install when
 no CIA is built

---
 CMakeLists.txt | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 978ceac8..d5f77cde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -760,23 +760,36 @@ if(NINTENDO_3DS)
   if(BANNERTOOL AND MAKEROM)
     add_custom_command(
       OUTPUT "isle.bnr"
-      COMMAND "${BANNERTOOL}" makebanner -i "../ISLE/res/3ds/banner.png" -a "../ISLE/res/3ds/banner.wav" -o "isle.bnr"
-      DEPENDS "../ISLE/res/3ds/banner.png" "../ISLE/res/3ds/banner.wav"
+      COMMAND "${BANNERTOOL}" makebanner
+        -i "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png"
+        -a "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav"
+        -o "isle.bnr"
+      DEPENDS "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png" "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav"
       VERBATIM
     )
 
     add_custom_command(
       OUTPUT "isle.cia"
-      COMMAND "${MAKEROM}" -f cia -exefslogo -o "isle.cia" -rsf "../ISLE/res/3ds/template.rsf" -major "${CMAKE_PROJECT_VERSION_MAJOR}" -minor "${CMAKE_PROJECT_VERSION_MINOR}" -micro 0 -icon "isle.smdh" -banner "isle.bnr" -elf "isle.elf"
-      DEPENDS "ISLE/res/3ds/template.rsf" "isle.smdh" "isle.bnr"
+      COMMAND "${MAKEROM}"
+        -f cia
+        -exefslogo
+        -o "isle.cia"
+        -rsf "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/template.rsf"
+        -major "${CMAKE_PROJECT_VERSION_MAJOR}"
+        -minor "${CMAKE_PROJECT_VERSION_MINOR}"
+        -micro 0
+        -icon "isle.smdh"
+        -banner "isle.bnr"
+        -elf "isle.elf"
+      DEPENDS "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/template.rsf" "isle.smdh" "isle.bnr"
       COMMENT "Building CIA executable target isle.cia"
       VERBATIM
     )
 
     add_custom_target("isle_cia" ALL DEPENDS "isle.cia" isle)
+    install(FILES "$<TARGET_FILE_DIR:isle>/isle.cia" DESTINATION "${CMAKE_INSTALL_BINDIR}")
   endif()
   install(FILES "$<TARGET_FILE_DIR:isle>/isle.3dsx" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-  install(FILES "$<TARGET_FILE_DIR:isle>/isle.cia" DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()
 if(WINDOWS_STORE)
   install(