Correct the dependencies of nblib tests

Fixes #3953

diff --git a/api/nblib/CMakeLists.txt b/api/nblib/CMakeLists.txt
index 270755922c9e45c92920ab03ba4d9a7f52c728f5..a2ce06596e0417cee6e42789c2fc10e5705b3663 100644 (file)
--- 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 e3672230769a547666e38386c192fa807203ea7d..610571b1a4176a81b0dbc0588aeefba8955b1acd 100644 (file)
--- 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 4707595b4dbc0a262e0278be67817b5b5819511d..23b9efc0531d8258fdf6cf3932a5e6b1372d837d 100644 (file)
--- 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})