Add custom target tests to compile tests

Change-Id: I436fe4e0cb15064088019e3099c4036954872dd9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4d5a32755f286bd8de1a0ad777eb20a2f0bb434..8348739ae87f5e3956496a868b6ac009e2388662 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,6 +489,7 @@ mark_as_advanced(GMX_USE_GTEST)
 mark_as_advanced(GMX_USE_GMOCK)
 if (BUILD_TESTING)
     add_subdirectory(src/external/gmock-1.6.0)
+    add_custom_target(tests)
 endif (BUILD_TESTING)
 set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/cmake/legacy_and_external.supp)
 

diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake
index 173819c538f0e4f7e9cbb45a61a13553c310a159..e54154298279081864d4a9068e7843e5b06de90f 100644 (file)
--- a/src/testutils/TestMacros.cmake
+++ b/src/testutils/TestMacros.cmake
@@ -12,6 +12,7 @@ function (add_gtest_test NAME EXENAME)
         add_test(NAME ${NAME}
                  COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${EXENAME}.xml)
         set_tests_properties(${NAME} PROPERTIES LABELS "GTest")
+       add_dependencies(tests ${EXENAME})
     endif ()
 endfunction ()
 
@@ -29,6 +30,7 @@ function (add_gmock_test NAME EXENAME)
         add_test(NAME ${NAME}
                  COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${EXENAME}.xml)
         set_tests_properties(${NAME} PROPERTIES LABELS "GTest")
+       add_dependencies(tests ${EXENAME})
     endif ()
 endfunction ()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d1c2d7061068a275f82e7039c74a8f2015c1209b..dd65ebeccb21d00d17e5d396f22a94a10bda3542 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_test(NAME TestExec_mdrun-h
          COMMAND mdrun -h)
+add_dependencies(tests mdrun)