From 9db8d35d2a0fb96cf6b25d29996f620ccd4627ed Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Fri, 10 Feb 2017 15:10:44 -0500
Subject: [PATCH] Put back gtest linking
---
Framework/API/test/CMakeLists.txt | 3 ++-
Framework/Algorithms/test/CMakeLists.txt | 3 ++-
Framework/Beamline/test/CMakeLists.txt | 3 ++-
Framework/Crystal/test/CMakeLists.txt | 3 ++-
Framework/CurveFitting/test/CMakeLists.txt | 3 ++-
Framework/DataObjects/test/CMakeLists.txt | 3 ++-
Framework/Geometry/test/CMakeLists.txt | 3 ++-
Framework/HistogramData/test/CMakeLists.txt | 3 ++-
Framework/Indexing/test/CMakeLists.txt | 3 ++-
Framework/Kernel/test/CMakeLists.txt | 1 +
Framework/MDAlgorithms/test/CMakeLists.txt | 1 +
Framework/RemoteAlgorithms/test/CMakeLists.txt | 3 ++-
Framework/RemoteJobManagers/test/CMakeLists.txt | 3 ++-
Framework/SINQ/test/CMakeLists.txt | 3 ++-
Framework/ScriptRepository/test/CMakeLists.txt | 3 ++-
Framework/Types/test/CMakeLists.txt | 3 ++-
MantidQt/API/test/CMakeLists.txt | 3 ++-
MantidQt/CustomInterfaces/test/CMakeLists.txt | 3 ++-
MantidQt/MantidWidgets/test/CMakeLists.txt | 1 +
MantidQt/SliceViewer/CMakeLists.txt | 3 ++-
MantidQt/SliceViewer/test/CMakeLists.txt | 3 ++-
Vates/VatesAPI/CMakeLists.txt | 1 +
Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt | 3 ++-
23 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/Framework/API/test/CMakeLists.txt b/Framework/API/test/CMakeLists.txt
index 05e00d44fb3..6c9d2daba95 100644
--- a/Framework/API/test/CMakeLists.txt
+++ b/Framework/API/test/CMakeLists.txt
@@ -25,7 +25,8 @@ if ( CXXTEST_FOUND )
${Boost_LIBRARIES}
${POCO_LIBRARIES}
${MUPARSER_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests APITest )
# Test data
diff --git a/Framework/Algorithms/test/CMakeLists.txt b/Framework/Algorithms/test/CMakeLists.txt
index afbb274d996..d49f1009686 100644
--- a/Framework/Algorithms/test/CMakeLists.txt
+++ b/Framework/Algorithms/test/CMakeLists.txt
@@ -51,7 +51,8 @@ if ( CXXTEST_FOUND )
Nexus
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( AlgorithmsTest Crystal CurveFitting )
add_dependencies ( FrameworkTests AlgorithmsTest )
# Test data
diff --git a/Framework/Beamline/test/CMakeLists.txt b/Framework/Beamline/test/CMakeLists.txt
index d216fa8efa3..f4850009913 100644
--- a/Framework/Beamline/test/CMakeLists.txt
+++ b/Framework/Beamline/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
target_link_libraries( BeamlineTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
Beamline
${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests BeamlineTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Crystal/test/CMakeLists.txt b/Framework/Crystal/test/CMakeLists.txt
index 5c69a7f7994..fe2d2ff0949 100644
--- a/Framework/Crystal/test/CMakeLists.txt
+++ b/Framework/Crystal/test/CMakeLists.txt
@@ -22,7 +22,8 @@ if ( CXXTEST_FOUND )
MDAlgorithms
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( CrystalTest Algorithms CurveFitting )
add_dependencies ( FrameworkTests CrystalTest )
# Test data
diff --git a/Framework/CurveFitting/test/CMakeLists.txt b/Framework/CurveFitting/test/CMakeLists.txt
index 9a850ccc050..077bb0bbeda 100644
--- a/Framework/CurveFitting/test/CMakeLists.txt
+++ b/Framework/CurveFitting/test/CMakeLists.txt
@@ -24,7 +24,8 @@ if ( CXXTEST_FOUND )
${GSL_LIBRARIES}
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( CurveFittingTest Algorithms )
add_dependencies ( FrameworkTests CurveFittingTest )
# Test data
diff --git a/Framework/DataObjects/test/CMakeLists.txt b/Framework/DataObjects/test/CMakeLists.txt
index 692e14bfa61..254b2d341d3 100644
--- a/Framework/DataObjects/test/CMakeLists.txt
+++ b/Framework/DataObjects/test/CMakeLists.txt
@@ -27,7 +27,8 @@ if ( CXXTEST_FOUND )
${JSONCPP_LIBRARIES}
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
# Specify implicit dependency, but don't link to it
add_dependencies ( FrameworkTests DataObjectsTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Geometry/test/CMakeLists.txt b/Framework/Geometry/test/CMakeLists.txt
index 71d8b7e8c1c..4487264dda5 100644
--- a/Framework/Geometry/test/CMakeLists.txt
+++ b/Framework/Geometry/test/CMakeLists.txt
@@ -20,7 +20,8 @@ if ( CXXTEST_FOUND )
${GSL_LIBRARIES}
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests GeometryTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/HistogramData/test/CMakeLists.txt b/Framework/HistogramData/test/CMakeLists.txt
index a5a9c1817e6..8888a8552f3 100644
--- a/Framework/HistogramData/test/CMakeLists.txt
+++ b/Framework/HistogramData/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
target_link_libraries( HistogramDataTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
HistogramData
${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests HistogramDataTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Indexing/test/CMakeLists.txt b/Framework/Indexing/test/CMakeLists.txt
index b861bfe8bed..6df06106b77 100644
--- a/Framework/Indexing/test/CMakeLists.txt
+++ b/Framework/Indexing/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
target_link_libraries( IndexingTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
Indexing
${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests IndexingTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Kernel/test/CMakeLists.txt b/Framework/Kernel/test/CMakeLists.txt
index 5a8db34bbeb..567e5b5ba93 100644
--- a/Framework/Kernel/test/CMakeLists.txt
+++ b/Framework/Kernel/test/CMakeLists.txt
@@ -15,6 +15,7 @@ if ( CXXTEST_FOUND )
${Boost_LIBRARIES}
${POCO_LIBRARIES}
${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES}
${JSONCPP_LIBRARIES}
${TBB_LIBRARIES}
${TBB_MALLOC_LIBRARIES}
diff --git a/Framework/MDAlgorithms/test/CMakeLists.txt b/Framework/MDAlgorithms/test/CMakeLists.txt
index 39603ebb067..32b99b0e04c 100644
--- a/Framework/MDAlgorithms/test/CMakeLists.txt
+++ b/Framework/MDAlgorithms/test/CMakeLists.txt
@@ -29,6 +29,7 @@ if ( CXXTEST_FOUND )
${POCO_LIBRARIES}
${MUPARSER_LIBRARIES}
${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES}
${NEXUS_LIBRARIES}
${HDF5_LIBRARIES} )
diff --git a/Framework/RemoteAlgorithms/test/CMakeLists.txt b/Framework/RemoteAlgorithms/test/CMakeLists.txt
index b597f37db0c..1db46d7bbd4 100644
--- a/Framework/RemoteAlgorithms/test/CMakeLists.txt
+++ b/Framework/RemoteAlgorithms/test/CMakeLists.txt
@@ -9,7 +9,8 @@ if ( CXXTEST_FOUND )
RemoteAlgorithms
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests RemoteAlgorithmsTest )
# Test data. Not using any for now. Remember to uncomment if data is added for these remote alg. tests
# add_dependencies ( RemoteAlgorithmsTest StandardTestData )
diff --git a/Framework/RemoteJobManagers/test/CMakeLists.txt b/Framework/RemoteJobManagers/test/CMakeLists.txt
index fc66b01d6de..f6c492b9623 100644
--- a/Framework/RemoteJobManagers/test/CMakeLists.txt
+++ b/Framework/RemoteJobManagers/test/CMakeLists.txt
@@ -8,7 +8,8 @@ if ( CXXTEST_FOUND )
RemoteJobManagers
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests RemoteJobManagersTest )
# Test data. Not using any for now. Remember to uncomment if data is added for these remote job managers
# add_dependencies ( RemoteJobManagersTest StandardTestData )
diff --git a/Framework/SINQ/test/CMakeLists.txt b/Framework/SINQ/test/CMakeLists.txt
index 20a9d10956a..457205b9558 100644
--- a/Framework/SINQ/test/CMakeLists.txt
+++ b/Framework/SINQ/test/CMakeLists.txt
@@ -16,7 +16,8 @@ if ( CXXTEST_FOUND )
SINQ
CurveFitting
${MANTIDLIBS}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
# Test data
add_dependencies ( PSISINQTest StandardTestData )
diff --git a/Framework/ScriptRepository/test/CMakeLists.txt b/Framework/ScriptRepository/test/CMakeLists.txt
index 24b5adfef37..07c02b46849 100644
--- a/Framework/ScriptRepository/test/CMakeLists.txt
+++ b/Framework/ScriptRepository/test/CMakeLists.txt
@@ -11,7 +11,8 @@ if ( CXXTEST_FOUND )
ScriptRepository
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests ScriptRepositoryTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Types/test/CMakeLists.txt b/Framework/Types/test/CMakeLists.txt
index 751e4834b0e..ab7cb338765 100644
--- a/Framework/Types/test/CMakeLists.txt
+++ b/Framework/Types/test/CMakeLists.txt
@@ -4,7 +4,8 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( TypesTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_link_libraries( TypesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies ( FrameworkTests TypesTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/MantidQt/API/test/CMakeLists.txt b/MantidQt/API/test/CMakeLists.txt
index eb8e92a6b54..9e8925d1bd6 100644
--- a/MantidQt/API/test/CMakeLists.txt
+++ b/MantidQt/API/test/CMakeLists.txt
@@ -25,7 +25,8 @@ if ( CXXTEST_FOUND )
${QWT_LIBRARIES}
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies( GUITests MantidQtAPITest )
# Add to the 'UnitTests' group in VS
diff --git a/MantidQt/CustomInterfaces/test/CMakeLists.txt b/MantidQt/CustomInterfaces/test/CMakeLists.txt
index 5d5d30c3ce9..38d369761c1 100644
--- a/MantidQt/CustomInterfaces/test/CMakeLists.txt
+++ b/MantidQt/CustomInterfaces/test/CMakeLists.txt
@@ -24,7 +24,8 @@ if ( CXXTEST_FOUND )
${POCO_LIBRARIES}
${QWT_LIBRARIES}
${QT_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies( CustomInterfacesTest MDAlgorithms )
# Test data
diff --git a/MantidQt/MantidWidgets/test/CMakeLists.txt b/MantidQt/MantidWidgets/test/CMakeLists.txt
index bfbac70ad00..70a8d3d5cfa 100644
--- a/MantidQt/MantidWidgets/test/CMakeLists.txt
+++ b/MantidQt/MantidWidgets/test/CMakeLists.txt
@@ -20,6 +20,7 @@ if ( CXXTEST_FOUND )
${Boost_LIBRARIES}
${POCO_LIBRARIES}
${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES}
)
# Add to the 'UnitTests' group in VS
diff --git a/MantidQt/SliceViewer/CMakeLists.txt b/MantidQt/SliceViewer/CMakeLists.txt
index e6605ffb077..360b003d77b 100644
--- a/MantidQt/SliceViewer/CMakeLists.txt
+++ b/MantidQt/SliceViewer/CMakeLists.txt
@@ -200,7 +200,8 @@ if ( CXXTEST_FOUND )
${Boost_LIBRARIES}
${POCO_LIBRARIES}
${QT_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies( GUITests SliceViewerTest )
# Add to the 'UnitTests' group in VS
diff --git a/MantidQt/SliceViewer/test/CMakeLists.txt b/MantidQt/SliceViewer/test/CMakeLists.txt
index 5061fd18eeb..88e1b728830 100644
--- a/MantidQt/SliceViewer/test/CMakeLists.txt
+++ b/MantidQt/SliceViewer/test/CMakeLists.txt
@@ -26,7 +26,8 @@ if ( CXXTEST_FOUND )
${QWT_LIBRARIES}
${Boost_LIBRARIES}
${POCO_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies( GUITests SliceViewerTest )
diff --git a/Vates/VatesAPI/CMakeLists.txt b/Vates/VatesAPI/CMakeLists.txt
index 6c3bc24731c..fd87cd22eee 100644
--- a/Vates/VatesAPI/CMakeLists.txt
+++ b/Vates/VatesAPI/CMakeLists.txt
@@ -268,6 +268,7 @@ target_link_libraries( VatesAPITest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES}
${QWT_LIBRARIES}
Qt4::QtCore
)
diff --git a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index bd36633fb7e..306d8931c18 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -177,7 +177,8 @@ target_link_libraries( VatesSimpleGuiViewWidgetsTest LINK_PRIVATE ${TCMALLOC_LIB
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
- ${GMOCK_LIBRARIES} )
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
add_dependencies( AllTests VatesSimpleGuiViewWidgetsTest )
# Add to the 'UnitTests' group in VS
--
GitLab