From 62f39d9b0f4b5310fe3c3c8c09d01ce4573896cf Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 10 Oct 2024 18:41:49 +0200 Subject: [PATCH] [cmake] Check for tool existence when adding a dep. --- Applications/Python/CMakeLists.txt | 14 +------------- Tests/CMakeLists.txt | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Applications/Python/CMakeLists.txt b/Applications/Python/CMakeLists.txt index c2289b3f7f2..219376308ef 100644 --- a/Applications/Python/CMakeLists.txt +++ b/Applications/Python/CMakeLists.txt @@ -50,19 +50,7 @@ if(OGS_USE_PIP) "-DTEST_COMMAND_IS_EXPECTED_TO_SUCCEED=TRUE" -P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestWrapper.cmake ) - set_tests_properties( - pytest PROPERTIES LABELS "default;python" COST 10 - ) - - add_dependencies( - ctest - GMSH2OGS - Layers2Grid - AddFaultToVoxelGrid - ExtractBoundary - vtkdiff - generateStructuredMesh - ) + set_tests_properties(pytest PROPERTIES LABELS "default;python" COST 10) endif() endif() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 66b62c62662..17b5c1ab576 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,6 +1,15 @@ set(CMAKE_FOLDER "Testing") # ctest dependencies -foreach(tool vtkdiff xdmfdiff) +foreach( + tool + vtkdiff + xdmfdiff + GMSH2OGS + Layers2Grid + AddFaultToVoxelGrid + ExtractBoundary + generateStructuredMesh +) if(TARGET ${tool}) list(APPEND test_dependencies ${tool}) endif() @@ -86,9 +95,9 @@ endif() ogs_add_executable(testrunner ${TEST_SOURCES}) target_sources( - testrunner PRIVATE ProcessLib/Graph/TestGet.cpp - ProcessLib/Graph/TestApply.cpp - ProcessLib/Graph/TestCheckEvalOrderRT.cpp + testrunner + PRIVATE ProcessLib/Graph/TestGet.cpp ProcessLib/Graph/TestApply.cpp + ProcessLib/Graph/TestCheckEvalOrderRT.cpp ) target_link_libraries(