From c6589139e7e3db10320d19ee72443463b2d3578e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 30 Jun 2020 09:57:29 +0200
Subject: [PATCH] [T] Cleanup ctest dependencies.
---
scripts/cmake/test/AddTest.cmake | 2 +-
scripts/cmake/test/OgsTest.cmake | 5 -----
scripts/cmake/test/Test.cmake | 3 +++
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index fb18a77ae85..e44273373ef 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -280,7 +280,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
LABELS "${DIR_LABELS}"
)
- if(TARGET ${AddTest_EXECUTABLE})
+ if(NOT "${AddTest_EXECUTABLE}" STREQUAL "ogs" AND TARGET ${AddTest_EXECUTABLE})
add_dependencies(ctest ${AddTest_EXECUTABLE})
add_dependencies(ctest-large ${AddTest_EXECUTABLE})
endif()
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 5f332a96757..cf44de6c663 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -58,9 +58,4 @@ function (OgsTest)
DISABLED ${OgsTest_DISABLED}
LABELS "${DIR_LABELS}"
)
-
- if(TARGET ${OgsTest_EXECUTABLE})
- add_dependencies(ctest ${OgsTest_EXECUTABLE})
- add_dependencies(ctest-large ${OgsTest_EXECUTABLE})
- endif()
endfunction()
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 3f4e363989b..e9e12ee3936 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -91,3 +91,6 @@ set_directory_properties(PROPERTIES
set_target_properties(ctest ctest-large ctest-cleanup ctest-large-cleanup
PROPERTIES FOLDER Testing)
+
+add_dependencies(ctest ogs)
+add_dependencies(ctest-large ogs)
--
GitLab