From 7daa3fdf5d5ac45319ecf7ee9ad9af038dacc35d Mon Sep 17 00:00:00 2001
From: Christopher Ruwisch <christopher.ruwisch@gmail.com>
Date: Tue, 10 Dec 2024 11:07:09 +0100
Subject: [PATCH 1/2] added check if tests are enabled but folder and
CMakeLists.txt are missing
---
aerodynamic_analysis/CMakeLists.txt | 3 +--
create_mission_xml/CMakeLists.txt | 2 +-
ecological_assessment/CMakeLists.txt | 2 +-
empennage_design/CMakeLists.txt | 2 +-
initial_sizing/CMakeLists.txt | 2 +-
mission_analysis/CMakeLists.txt | 2 +-
performance_assessment/CMakeLists.txt | 2 +-
wing_design/CMakeLists.txt | 2 +-
8 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/aerodynamic_analysis/CMakeLists.txt b/aerodynamic_analysis/CMakeLists.txt
index 6d50a46b..64fca1f8 100644
--- a/aerodynamic_analysis/CMakeLists.txt
+++ b/aerodynamic_analysis/CMakeLists.txt
@@ -61,10 +61,9 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
-
# Download LiftingLine
add_subdirectory(LiftingLine)
diff --git a/create_mission_xml/CMakeLists.txt b/create_mission_xml/CMakeLists.txt
index 97818101..f09a4673 100644
--- a/create_mission_xml/CMakeLists.txt
+++ b/create_mission_xml/CMakeLists.txt
@@ -44,7 +44,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTESTS)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/ecological_assessment/CMakeLists.txt b/ecological_assessment/CMakeLists.txt
index 498d8d5c..5dd681a6 100644
--- a/ecological_assessment/CMakeLists.txt
+++ b/ecological_assessment/CMakeLists.txt
@@ -88,7 +88,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/empennage_design/CMakeLists.txt b/empennage_design/CMakeLists.txt
index 3cadc105..7101e065 100644
--- a/empennage_design/CMakeLists.txt
+++ b/empennage_design/CMakeLists.txt
@@ -85,7 +85,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/initial_sizing/CMakeLists.txt b/initial_sizing/CMakeLists.txt
index 17d33e20..c243fdb7 100644
--- a/initial_sizing/CMakeLists.txt
+++ b/initial_sizing/CMakeLists.txt
@@ -45,7 +45,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}$<0:>
)
# Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/mission_analysis/CMakeLists.txt b/mission_analysis/CMakeLists.txt
index 2945dd6d..c957d3d9 100644
--- a/mission_analysis/CMakeLists.txt
+++ b/mission_analysis/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/performance_assessment/CMakeLists.txt b/performance_assessment/CMakeLists.txt
index ce8e303a..c20a9dfc 100644
--- a/performance_assessment/CMakeLists.txt
+++ b/performance_assessment/CMakeLists.txt
@@ -55,7 +55,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
diff --git a/wing_design/CMakeLists.txt b/wing_design/CMakeLists.txt
index 2fec82f3..18a360ea 100644
--- a/wing_design/CMakeLists.txt
+++ b/wing_design/CMakeLists.txt
@@ -85,7 +85,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
)
# Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()
--
GitLab
From 7b592c16614f7aa2b2420e0033f106a12fc0c8cf Mon Sep 17 00:00:00 2001
From: Christopher Ruwisch <christopher.ruwisch@gmail.com>
Date: Tue, 10 Dec 2024 11:48:52 +0100
Subject: [PATCH 2/2] removed deprecated links to the library
---
ecological_assessment/test/CMakeLists.txt | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/ecological_assessment/test/CMakeLists.txt b/ecological_assessment/test/CMakeLists.txt
index 0b3e6aad..ec986f28 100644
--- a/ecological_assessment/test/CMakeLists.txt
+++ b/ecological_assessment/test/CMakeLists.txt
@@ -13,15 +13,13 @@ if (BUILD_BLACKBOXTESTS)
# Link the test executable against UNICADO libs and gtest
target_link_libraries(blackbox_${MODULE_NAME}
PRIVATE
- UnicadoLibs::runtimeInfo
- UnicadoLibs::standardFiles
- UnicadoLibs::aixml
- UnicadoLibs::unitConversion
- UnicadoLibs::aircraftGeometry
- UnicadoLibs::engine
- UnicadoLibs::moduleBasics
- UnicadoLibs::svgPlot
- UnicadoLibs::atmosphere
+ UnicadoLibs::runtimeInfo
+ UnicadoLibs::standardFiles
+ UnicadoLibs::aixml
+ UnicadoLibs::unitConversion
+ UnicadoLibs::engine
+ UnicadoLibs::moduleBasics
+ UnicadoLibs::atmosphere
Matplot++::matplot
GTest::gtest
UnicadoLibs::blackboxTest
--
GitLab