Merge branch release-5-1 into release-2016

[alexxy/gromacs.git] / src / programs / mdrun / tests / CMakeLists.txt

diff --git a/src/programs/mdrun/tests/CMakeLists.txt b/src/programs/mdrun/tests/CMakeLists.txt
index 22dc2532fc86f5bf7a036a6507117c733ce8fe91..cfbdb09568d3d5df5f3fae98d8c62d5026b7eafe 100644 (file)
--- a/src/programs/mdrun/tests/CMakeLists.txt
+++ b/src/programs/mdrun/tests/CMakeLists.txt
@@ -35,18 +35,20 @@
 set(testname "MdrunTests")
 set(exename "mdrun-test")
 
-gmx_build_unit_test(
-    ${testname}
+gmx_add_gtest_executable(
     ${exename}
     # files with code for tests
     tabulated_bonded_interactions.cpp
+    energyreader.cpp
     grompp.cpp
     rerun.cpp
     trajectory_writing.cpp
+    trajectoryreader.cpp
     compressed_x_output.cpp
     swapcoords.cpp
     interactiveMD.cpp
     # files with code for test fixtures
+    mdruncomparisonfixture.cpp
     moduletest.cpp
     # pseudo-library for code for mdrun
     $<TARGET_OBJECTS:mdrun_objlib>
@@ -59,9 +61,8 @@ gmx_register_integration_test(
 set(testname "MdrunMpiTests")
 set(exename "mdrun-mpi-test")
 
-gmx_build_unit_test(
-    ${testname}
-    ${exename}
+gmx_add_gtest_executable(
+    ${exename} MPI
     # files with code for tests
     multisim.cpp
     multisimtest.cpp