Merge release-4-6 into master

[alexxy/gromacs.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ebe8f695443b3908411b6b18b3f7e96869a26f9d..b8c10d6d82a8f92d02f0bb54602c8e22da742104 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,10 +2,19 @@ configure_file(config.h.cmakein config.h)
 configure_file(buildinfo.h.cmakein buildinfo.h)
 
 include(../cmake/BuildManPages.cmake)
+if (BUILD_TESTING)
+    add_custom_target(tests)
+    if (GMX_BUILD_UNITTESTS)
+        add_subdirectory(external/gmock-1.6.0)
+    endif (GMX_BUILD_UNITTESTS)
+    include(testutils/TestMacros.cmake)
+    if (GMX_BUILD_UNITTESTS)
+        add_subdirectory(testutils)
+    endif (GMX_BUILD_UNITTESTS)
+endif (BUILD_TESTING)
 
-add_subdirectory(gmxlib)
-add_subdirectory(mdlib)
-add_subdirectory(kernel)
+add_subdirectory(gromacs)
+add_subdirectory(programs)
 
 if(NOT GMX_FAHCORE)
   add_subdirectory(tools)