Merge gromacs-4-6 into master

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f07b127abce58c996aceb42598ab600e4040c53f..495c8aeef40bdba1f0caaf93e424d71e33829c05 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,13 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+if (BUILD_TESTING)
+    include(testutils/TestMacros.cmake)
+    add_subdirectory(testutils)
+endif (BUILD_TESTING)
 
-add_subdirectory(gmxlib)
-add_subdirectory(mdlib)
+add_subdirectory(gromacs)
 add_subdirectory(kernel)
+add_subdirectory(programs)
 
 if(NOT GMX_FAHCORE)
   add_subdirectory(tools)