Merge remote-tracking branch 'origin/release-4-6' into HEAD

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d61ef4ec407ec637ad886bb5b92e983e4032e00..d4390cad804b1630ba375a5dc3002f5c30240b9b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,19 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/config.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)