From fdf35232eeee6d0cfb527b66d01a85e97e949d1e Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 18 Jul 2022 11:47:00 +0200
Subject: [PATCH] some fixes

---
 CMakeLists.txt                | 7 +++----
 src/fsfw_tests/CMakeLists.txt | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcfa89ae..f38eacff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,10 +163,9 @@ if(FSFW_BUILD_UNITTESTS)
     list(APPEND FSFW_FETCH_CONTENT_TARGETS Catch2)
   endif()
 
-  set(FSFW_CONFIG_PATH tests/src/fsfw_tests/unit/testcfg)
-  configure_file(tests/src/fsfw_tests/unit/testcfg/FSFWConfig.h.in FSFWConfig.h)
-  configure_file(tests/src/fsfw_tests/unit/testcfg/TestsConfig.h.in
-                 tests/TestsConfig.h)
+  set(FSFW_CONFIG_PATH unittests/testcfg/)
+  configure_file(unittests/testcfg/FSFWConfig.h.in FSFWConfig.h)
+  configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h)
 
   project(${FSFW_TEST_TGT} CXX C)
   add_executable(${FSFW_TEST_TGT})
diff --git a/src/fsfw_tests/CMakeLists.txt b/src/fsfw_tests/CMakeLists.txt
index f6e1b8ab..8e047e73 100644
--- a/src/fsfw_tests/CMakeLists.txt
+++ b/src/fsfw_tests/CMakeLists.txt
@@ -2,8 +2,6 @@ if(FSFW_ADD_INTERNAL_TESTS)
     add_subdirectory(internal)
 endif()
 
-if(FSFW_BUILD_UNITTESTS)
-    add_subdirectory(unit)
-else()
+if(NOT FSFW_BUILD_UNITTESTS)
     add_subdirectory(integration)
 endif()