From 774f2a330f45f6c97bbf4b65f69b1427223f5fbb Mon Sep 17 00:00:00 2001
From: Peter Peterson <petersonpf@ornl.gov>
Date: Tue, 4 Jan 2011 17:04:41 +0000
Subject: [PATCH] Adding FrameworkTests target. Refs #1881.
---
Code/Mantid/Framework/API/CMakeLists.txt | 1 +
Code/Mantid/Framework/Algorithms/CMakeLists.txt | 3 ++-
Code/Mantid/Framework/CMakeLists.txt | 4 +++-
Code/Mantid/Framework/CurveFitting/CMakeLists.txt | 1 +
Code/Mantid/Framework/DataHandling/CMakeLists.txt | 1 +
Code/Mantid/Framework/DataObjects/CMakeLists.txt | 2 +-
Code/Mantid/Framework/Geometry/CMakeLists.txt | 1 +
Code/Mantid/Framework/ICat/CMakeLists.txt | 1 +
Code/Mantid/Framework/Kernel/CMakeLists.txt | 1 +
Code/Mantid/Framework/Nexus/CMakeLists.txt | 1 +
Code/Mantid/Framework/PythonAPI/CMakeLists.txt | 1 +
11 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
index d67ba3fabb6..1eafbc8a877 100644
--- a/Code/Mantid/Framework/API/CMakeLists.txt
+++ b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -188,4 +188,5 @@ target_link_libraries ( API ${MANTIDLIBS} ${WINSOCK} )
if ( CXXTEST_FOUND )
cxxtest_add_test ( APITest ${TEST_FILES} )
target_link_libraries( APITest API )
+ add_dependencies ( FrameworkTests APITest )
endif ()
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index 8590afe2585..3c34d5bbb87 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -376,5 +376,6 @@ target_link_libraries ( Algorithms ${MANTIDLIBS} ${GSL_LIBRARIES} )
if ( CXXTEST_FOUND )
include_directories ( ../CurveFitting/inc ../DataHandling/inc ../Nexus/inc )
cxxtest_add_test ( AlgorithmsTest ${TEST_FILES} )
- target_link_libraries( AlgorithmsTest Algorithms CurveFitting DataHandling Nexus )
+ target_link_libraries ( AlgorithmsTest Algorithms CurveFitting DataHandling Nexus )
+ add_dependencies ( FrameworkTests AlgorithmsTest )
endif ()
diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
index d4883b507e3..f02caad068e 100644
--- a/Code/Mantid/Framework/CMakeLists.txt
+++ b/Code/Mantid/Framework/CMakeLists.txt
@@ -70,6 +70,8 @@ endif ()
# Now add the packages one-by-one, building up the dependencies as we go
###########################################################################
+add_custom_target ( FrameworkTests ) # target for all framework tests
+
include_directories (Kernel/inc)
add_subdirectory (Kernel)
set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
@@ -115,4 +117,4 @@ if ( ${MAKE_VATES} )
set ( FRAMEWORK_LIBS ${FRAMEWORK_LIBS} MDDataObjects MDAlgorithms )
endif ()
-add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS} )
\ No newline at end of file
+add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS} )
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
index 988688d7379..1c423f423d4 100644
--- a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
+++ b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -113,4 +113,5 @@ if ( CXXTEST_FOUND )
include_directories ( ../DataHandling/inc ../Nexus/inc )
cxxtest_add_test ( CurveFittingTest ${TEST_FILES} )
target_link_libraries( CurveFittingTest CurveFitting DataHandling Nexus )
+ add_dependencies ( FrameworkTests CurveFittingTest )
endif ()
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
index 9bff5d9914a..f702bb94c4f 100644
--- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -182,4 +182,5 @@ if ( CXXTEST_FOUND )
include_directories ( ../Nexus/inc )
cxxtest_add_test ( DataHandlingTest ${TEST_FILES} )
target_link_libraries( DataHandlingTest DataHandling Nexus )
+ add_dependencies ( FrameworkTests DataHandlingTest )
endif ()
diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
index 483ad36d018..df5fd1d3a9f 100644
--- a/Code/Mantid/Framework/DataObjects/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
@@ -58,7 +58,7 @@ include_directories ( ${ZLIB_INCLUDE_DIRS} )
target_link_libraries ( DataObjects ${MANTIDLIBS} ${ZLIB_LIBRARIES} )
if ( CXXTEST_FOUND )
- #include_directories ( ../Nexus/inc )
cxxtest_add_test ( DataObjectsTest ${TEST_FILES} )
target_link_libraries( DataObjectsTest DataObjects )
+ add_dependencies ( FrameworkTests DataObjectsTest )
endif ()
diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt
index bb4723e530b..91e499d43b1 100644
--- a/Code/Mantid/Framework/Geometry/CMakeLists.txt
+++ b/Code/Mantid/Framework/Geometry/CMakeLists.txt
@@ -221,4 +221,5 @@ target_link_libraries ( Geometry ${MANTIDLIBS} ${OPENCASCADE_LIBRARIES} ${OPENGL
if ( CXXTEST_FOUND )
cxxtest_add_test ( GeometryTest ${TEST_FILES} )
target_link_libraries( GeometryTest Geometry )
+ add_dependencies ( FrameworkTests GeometryTest )
endif ()
\ No newline at end of file
diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt
index 71b9a9f1275..cd778aba400 100644
--- a/Code/Mantid/Framework/ICat/CMakeLists.txt
+++ b/Code/Mantid/Framework/ICat/CMakeLists.txt
@@ -69,4 +69,5 @@ target_link_libraries ( ICat ${MANTIDLIBS} ${OPENSSL_LIBRARIES} )
if ( CXXTEST_FOUND )
cxxtest_add_test ( ICatTest ${TEST_FILES} )
target_link_libraries( ICatTest ICat )
+ add_dependencies ( FrameworkTests ICatTest )
endif ()
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
index 3bfa10f2a77..cf0fa554b47 100644
--- a/Code/Mantid/Framework/Kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -202,4 +202,5 @@ add_custom_command ( TARGET Kernel POST_BUILD
if ( CXXTEST_FOUND )
cxxtest_add_test ( KernelTest ${TEST_FILES} )
target_link_libraries( KernelTest Kernel )
+ add_dependencies ( FrameworkTests KernelTest )
endif ()
diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt
index fea64772611..3abab817ff6 100644
--- a/Code/Mantid/Framework/Nexus/CMakeLists.txt
+++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt
@@ -86,4 +86,5 @@ if ( CXXTEST_FOUND )
include_directories (../DataHandling/inc )
cxxtest_add_test ( NexusTest ${TEST_FILES} )
target_link_libraries( NexusTest Nexus DataHandling )
+ add_dependencies ( FrameworkTests NexusTest )
endif ()
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
index f6cff2790b0..3ec51b159f7 100644
--- a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -66,4 +66,5 @@ if ( CXXTEST_FOUND )
include_directories ( ../DataHandling/inc ../DataObjects/inc )
cxxtest_add_test ( PythonAPITest ${TEST_FILES} )
target_link_libraries( PythonAPITest PythonAPI DataHandling DataObjects )
+ add_dependencies ( FrameworkTests PythonAPITest )
endif ()
--
GitLab