diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt index 9ebfa016ec0f8ba783fec5d6ed3852b5c979a0a4..6203c15f206e527c56092a87661b2f3c675de134 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 5402c39e5620c0b5af1176cd754476328b418710..8ba86e753bc4add79a9a12369a6dca7eb3c07205 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 2967bd22e22e4936dd10918cc941369e140a74fb..a95ff413775e4fd893f579e93f72e48938120d7f 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