From dd62bfc01084774c0c5827a3d31d58bf7f61193f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 28 Sep 2022 19:53:31 +0200
Subject: [PATCH] change the structure a bit

---
 .../01-tasks-solutions/main-01.cpp              |  0
 .../01-tasks-solutions/main-02.cpp              |  0
 .../01-tasks-solutions/main-03.cpp              |  0
 .../01-tasks-solutions/main-04.cpp              |  0
 {start => 01-tasks}/01-tasks.md                 |  0
 CMakeLists.txt                                  | 17 +++++++----------
 start/main.cpp => main.cpp                      |  0
 start/CMakeLists.txt                            |  3 ---
 8 files changed, 7 insertions(+), 13 deletions(-)
 rename {start => 01-tasks}/01-tasks-solutions/main-01.cpp (100%)
 rename {start => 01-tasks}/01-tasks-solutions/main-02.cpp (100%)
 rename {start => 01-tasks}/01-tasks-solutions/main-03.cpp (100%)
 rename {start => 01-tasks}/01-tasks-solutions/main-04.cpp (100%)
 rename {start => 01-tasks}/01-tasks.md (100%)
 rename start/main.cpp => main.cpp (100%)
 delete mode 100644 start/CMakeLists.txt

diff --git a/start/01-tasks-solutions/main-01.cpp b/01-tasks/01-tasks-solutions/main-01.cpp
similarity index 100%
rename from start/01-tasks-solutions/main-01.cpp
rename to 01-tasks/01-tasks-solutions/main-01.cpp
diff --git a/start/01-tasks-solutions/main-02.cpp b/01-tasks/01-tasks-solutions/main-02.cpp
similarity index 100%
rename from start/01-tasks-solutions/main-02.cpp
rename to 01-tasks/01-tasks-solutions/main-02.cpp
diff --git a/start/01-tasks-solutions/main-03.cpp b/01-tasks/01-tasks-solutions/main-03.cpp
similarity index 100%
rename from start/01-tasks-solutions/main-03.cpp
rename to 01-tasks/01-tasks-solutions/main-03.cpp
diff --git a/start/01-tasks-solutions/main-04.cpp b/01-tasks/01-tasks-solutions/main-04.cpp
similarity index 100%
rename from start/01-tasks-solutions/main-04.cpp
rename to 01-tasks/01-tasks-solutions/main-04.cpp
diff --git a/start/01-tasks.md b/01-tasks/01-tasks.md
similarity index 100%
rename from start/01-tasks.md
rename to 01-tasks/01-tasks.md
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cde9423..5a3d847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.0)
 # We can version our project using CMake
-project(foo VERSION 0.1.0)
+project(fsfw-from-zero VERSION 0.1.0)
 
 # Sometimes, a C++ project might require a certain C++ standard to build.
 # The following directives make sure that the compiler supports the required
@@ -8,16 +8,13 @@ project(foo VERSION 0.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if(BUILD_FINISHED)
-  add_subdirectory(finished)
-endif()
-add_subdirectory(start)
-
+# Add the framework dependency
 set(FSFW_OSAL host CACHE STRING "FSFW OSAL")
 set(FSFW_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-
 add_subdirectory(fsfw)
+
+# Add our executable and its only source file
+add_executable(fsfw-from-zero main.cpp)
+
+# Link the framework so we can use it from our application
 target_link_libraries(fsfw-from-zero PRIVATE fsfw)
-if(BUILD_FINISHED)
-  target_link_libraries(fsfw-from-zero-done PRIVATE fsfw)
-endif()
diff --git a/start/main.cpp b/main.cpp
similarity index 100%
rename from start/main.cpp
rename to main.cpp
diff --git a/start/CMakeLists.txt b/start/CMakeLists.txt
deleted file mode 100644
index b53e048..0000000
--- a/start/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_executable(fsfw-from-zero)
-target_sources(fsfw-from-zero PRIVATE main.cpp)
-target_include_directories(fsfw-from-zero PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})