From 5f22248ea80e8490f253000b097b14f6cac9882c Mon Sep 17 00:00:00 2001
From: Dimitar Tasev <dimitar.tasev@stfc.ac.uk>
Date: Wed, 17 Jul 2019 11:33:43 +0100
Subject: [PATCH] Adds Python dependencies to AllTests target, re #16054
- Makes the `FrameworkTests` dependent on `Framework`
- Builds `mantidqt_iconsqt4` when `mantidqt` is built
---
Framework/CMakeLists.txt | 1 +
qt/CMakeLists.txt | 1 -
qt/python/CMakeLists.txt | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 9ebfa016ec0..6203c15f206 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -53,6 +53,7 @@ include(TargetFunctions)
add_custom_target(FrameworkTests) # target for all framework tests
add_dependencies(check FrameworkTests)
+add_dependencies(FrameworkTests Framework)
include_directories(Types/inc)
add_subdirectory(Types)
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 5402c39e562..8ba86e753bc 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -29,7 +29,6 @@ if(ENABLE_WORKBENCH AND NOT PYRCC5_CMD)
endif()
# Qt-based targets
-
add_subdirectory(icons)
add_subdirectory(widgets)
add_subdirectory(python)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 2967bd22e22..a95ff413775 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -46,7 +46,7 @@ if(ENABLE_WORKBENCH)
PythonInterface)
if(ENABLE_MANTIDPLOT)
- add_dependencies(mantidqt mantidqt_commonqt4)
+ add_dependencies(mantidqt mantidqt_commonqt4 mantidqt_iconsqt4)
endif()
if(MSVC)
@@ -60,7 +60,7 @@ if(ENABLE_WORKBENCH)
endif()
# Testing
-
+ add_dependencies(GUITests mantidqt)
# ctest targets
set(
PYTHON_TEST_FILES
--
GitLab