From 7bfe4c5b89e9877192b9f2cc723561ce500440a1 Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Tue, 13 Dec 2011 13:04:46 -0500
Subject: [PATCH] Refs #4316: Added AllTests target
that includes GUITests and FrameworkTests. Moved MantidQtAPI test to GUITests.
---
Code/Mantid/CMakeLists.txt | 6 ++++++
Code/Mantid/MantidQt/API/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
index cb12afb8d15..ae0ea0fc61d 100644
--- a/Code/Mantid/CMakeLists.txt
+++ b/Code/Mantid/CMakeLists.txt
@@ -84,6 +84,12 @@ if (PYUNITTEST_FOUND)
add_subdirectory ( scripts )
endif ()
+# Collect all tests together
+add_custom_target ( AllTests )
+add_dependencies ( AllTests FrameworkTests )
+add_dependencies ( AllTests GUITests )
+
+
###########################################################################
# Installation settings
###########################################################################
diff --git a/Code/Mantid/MantidQt/API/CMakeLists.txt b/Code/Mantid/MantidQt/API/CMakeLists.txt
index b2a797e041a..d611198868a 100644
--- a/Code/Mantid/MantidQt/API/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/API/CMakeLists.txt
@@ -85,7 +85,7 @@ if ( CXXTEST_FOUND )
if ( GMOCK_FOUND AND GTEST_FOUND )
cxxtest_add_test ( MantidQtAPITest ${TEST_FILES} ${GMOCK_TEST_FILES} )
target_link_libraries( MantidQtAPITest MantidQtAPI ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
- add_dependencies( FrameworkTests MantidQtAPITest )
+ add_dependencies( GUITests MantidQtAPITest )
# Add to the 'UnitTests' group in VS
set_property( TARGET MantidQtAPITest PROPERTY FOLDER "UnitTests" )
endif ()
--
GitLab