From 08dc8630d6acced74b4be491ccced5346271ecc6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 6 May 2022 16:43:12 +0200
Subject: [PATCH] create generic OBSW by default and copy to unique

---
 CMakeLists.txt                   |  7 ++-----
 cmake/HardwareOsPostConfig.cmake | 11 +++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96070b3..e2901caa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,11 +275,8 @@ add_library(${LIB_EIVE_MISSION})
 
 # Add main executable
 add_executable(${OBSW_NAME})
-if(EIVE_CREATE_UNIQUE_OBSW_BIN)
-    set(OBSW_BIN_NAME ${CMAKE_PROJECT_NAME}-$ENV{USERNAME})
-else()
-    set(OBSW_BIN_NAME ${CMAKE_PROJECT_NAME})
-endif()
+set(OBSW_BIN_NAME ${CMAKE_PROJECT_NAME})
+
 set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME})
 
 # Watchdog
diff --git a/cmake/HardwareOsPostConfig.cmake b/cmake/HardwareOsPostConfig.cmake
index cfa7a178..aa9e810e 100644
--- a/cmake/HardwareOsPostConfig.cmake
+++ b/cmake/HardwareOsPostConfig.cmake
@@ -33,6 +33,10 @@ add_compile_options(
 set(STRIPPED_OBSW_NAME ${CMAKE_PROJECT_NAME}-stripped)
 set(STRIPPED_WATCHDOG_NAME eive-watchdog-stripped)
 
+if(EIVE_CREATE_UNIQUE_OBSW_BIN)
+    set(UNIQUE_OBSW_BIN_NAME ${OBSW_BIN_NAME}-$ENV{USERNAME})
+endif()
+
 add_custom_command(
 	TARGET ${OBSW_NAME}
 	POST_BUILD
@@ -41,6 +45,13 @@ add_custom_command(
 	COMMENT "Generating stripped executable ${STRIPPED_OBSW_NAME}.."
 )
 
+add_custom_command(
+	TARGET ${OBSW_NAME}
+	POST_BUILD
+	COMMAND ${CMAKE_COMMAND} copy
+		${CMAKE_CURRENT_BINARY_DIR}/${OBSW_BIN_NAME}
+		${CMAKE_CURRENT_BINARY_DIR}/${UNIQUE_OBSW_BIN_NAME})
+
 add_custom_command(
     TARGET ${WATCHDOG_NAME}
     POST_BUILD