From 2466bdd0e4be71e70b0f87fd0c480c05f71fc545 Mon Sep 17 00:00:00 2001
From: Joe Jordan <ejjordan12@gmail.com>
Date: Mon, 8 Mar 2021 07:05:56 +0000
Subject: [PATCH] Correct the dependencies of nblib tests

Fixes #3953
---
 api/nblib/CMakeLists.txt         | 8 ++++++++
 api/nblib/samples/CMakeLists.txt | 3 +--
 api/nblib/tests/CMakeLists.txt   | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/nblib/CMakeLists.txt b/api/nblib/CMakeLists.txt
index 270755922c..a2ce06596e 100644
--- a/api/nblib/CMakeLists.txt
+++ b/api/nblib/CMakeLists.txt
@@ -71,11 +71,19 @@ if (BUILD_TESTING)
     include(${TESTUTILS_DIR}/TestMacros.cmake)
 endif()
 
+add_custom_target(nblib-tests
+        COMMENT "Target to build all nblib tests including samples"
+        )
+# Ensure that "make tests" builds all nblib tests so the top-level
+# "make check" will work.
+add_dependencies(tests nblib-tests)
+
 # this allows all nblib tests to be run with "make check-nblib"
 add_custom_target(check-nblib
         COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R NbLib
         COMMENT "Running nblib tests"
         USES_TERMINAL VERBATIM)
+add_dependencies(check-nblib nblib-tests)
 
 set(NBLIB_MAJOR 0)
 set(NBLIB_MINOR 1)
diff --git a/api/nblib/samples/CMakeLists.txt b/api/nblib/samples/CMakeLists.txt
index e367223076..610571b1a4 100644
--- a/api/nblib/samples/CMakeLists.txt
+++ b/api/nblib/samples/CMakeLists.txt
@@ -61,6 +61,5 @@ target_link_libraries(${methane} PRIVATE nblib)
 if(BUILD_TESTING)
     add_test(NAME NbLibSamplesTestArgon COMMAND ${argon})
     add_test(NAME NbLibSamplesTestMethaneWater COMMAND ${methane})
-    add_dependencies(check-nblib ${argon})
-    add_dependencies(check-nblib ${methane})
+    add_dependencies(nblib-tests ${argon} ${methane})
 endif()
diff --git a/api/nblib/tests/CMakeLists.txt b/api/nblib/tests/CMakeLists.txt
index 4707595b4d..23b9efc053 100644
--- a/api/nblib/tests/CMakeLists.txt
+++ b/api/nblib/tests/CMakeLists.txt
@@ -64,7 +64,7 @@ gmx_add_gtest_executable(
 target_link_libraries(${exename} PRIVATE nblib_test_infrastructure nblib)
 target_include_directories(${exename} PRIVATE ${PROJECT_SOURCE_DIR}/api)
 gmx_register_gtest_test(${testname} ${exename} INTEGRATION_TEST)
-add_dependencies(check-nblib ${exename})
+add_dependencies(nblib-tests ${exename})
 
 set(testname "NbLibIntegrationTests")
 set(exename "nblib-integration-test")
@@ -81,7 +81,7 @@ gmx_add_gtest_executable(
 target_link_libraries(${exename} PRIVATE nblib_test_infrastructure nblib)
 target_include_directories(${exename} PRIVATE ${PROJECT_SOURCE_DIR}/api)
 gmx_register_gtest_test(${testname} ${exename} INTEGRATION_TEST)
-add_dependencies(check-nblib ${exename})
+add_dependencies(nblib-tests ${exename})
 
 # The integrator sometimes times out on TSAN so it gets its own test harness
 set(testname "NbLibIntegratorTests")
@@ -95,5 +95,5 @@ gmx_add_gtest_executable(
 target_link_libraries(${exename} PRIVATE nblib_test_infrastructure nblib)
 target_include_directories(${exename} PRIVATE ${PROJECT_SOURCE_DIR}/api)
 gmx_register_gtest_test(${testname} ${exename} INTEGRATION_TEST)
-add_dependencies(check-nblib ${exename})
+add_dependencies(nblib-tests ${exename})
 
-- 
2.22.0