Commit e325bbd4 authored by Stephen's avatar Stephen
Browse files

Remove qt4 targets

parent b0f4efe3
......@@ -15,41 +15,6 @@ set(INC_FILES
ALFCustomInstrumentMocks.h)
# Target
mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesDirect
QT_VERSION 4
SRC
${SRC_FILES}
MOC
${MOC_FILES}
NOMOC
${INC_FILES}
DEFS
IN_MANTIDQT_DIRECT
SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
LINK_LIBS
DataObjects
${CORE_MANTIDLIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
QT4_LINK_LIBS
Qt4::QtOpenGL
Qwt5
MTD_QT_LINK_LIBS
MantidQtWidgetsCommon
MantidQtWidgetsInstrumentView
MantidQtWidgetsPlotting
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
@loader_path/../../Contents/MacOS
@loader_path/../../plugins/qt4
LINUX_INSTALL_RPATH
"\$ORIGIN/../../${LIB_DIR};\$ORIGIN/../../plugins/qt4/")
mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesDirect
QT_VERSION 5
SRC
......
......@@ -5,43 +5,6 @@ set(
ALFCustomInstrumentPresenterTest.h
)
mtd_add_qt_tests(
TARGET_NAME MantidQtInterfacesDirectTest
QT_VERSION 4
SRC ${TEST_FILES}
INCLUDE_DIRS
../../../../Framework/CurveFitting/inc
../../../../Framework/DataObjects/inc
../../../../Framework/TestHelpers/inc
../
TEST_HELPER_SRCS
../../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
../../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
../../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
../../../../Framework/TestHelpers/src/TearDownWorld.cpp
LINK_LIBS
CurveFitting
DataObjects
${GMOCK_LIBRARIES}
${GTEST_LIBRARIES}
${CORE_MANTIDLIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
Python::Python
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
gmock
QT4_LINK_LIBS
Qt4::QtOpenGL
Qwt5
MTD_QT_LINK_LIBS
MantidScientificInterfacesDirect
MantidQtWidgetsCommon
MantidQtWidgetsInstrumentView
MantidQtWidgetsPlotting
PARENT_DEPENDENCIES
GUITests)
mtd_add_qt_tests(
TARGET_NAME MantidQtInterfacesDirectTest
QT_VERSION 5
......
......@@ -29,37 +29,6 @@ set(UI_FILES
SampleTransmission.ui
StepScan.ui)
mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesGeneral
QT_VERSION 4
SRC ${SRC_FILES}
MOC ${MOC_FILES}
NOMOC ${INC_FILES}
UI ${UI_FILES}
DEFS IN_MANTIDQT_INTERFACESGENERAL
PRECOMPILED PrecompiledHeader.h
INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
LINK_LIBS
${CORE_MANTIDLIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
Json
QT4_LINK_LIBS
Qwt5
MTD_QT_LINK_LIBS
MantidQtWidgetsCommon
MantidQtWidgetsPlotting
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
@loader_path/../../Contents/MacOS
@loader_path/../../Contents/Frameworks
LINUX_INSTALL_RPATH
"\$ORIGIN/../../${LIB_DIR}")
mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesGeneral
QT_VERSION 5
SRC StepScan.cpp
......
......@@ -46,34 +46,6 @@ set(MOC_FILES ${GUI_MOC_FILES})
set(UI_FILES ${GUI_UI_FILES})
mtd_add_qt_library(
TARGET_NAME MantidScientificInterfacesISISReflectometry
QT_VERSION 4
SRC ${SRC_FILES}
MOC ${MOC_FILES}
NOMOC ${INC_FILES}
UI ${UI_FILES}
DEFS
IN_MANTIDQT_ISISREFLECTOMETRY
PRECOMPILED
PrecompiledHeader.h
INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
LINK_LIBS
${CORE_MANTIDLIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
QT4_LINK_LIBS Qwt5
MTD_QT_LINK_LIBS
MantidQtWidgetsCommon
MantidQtIcons
INSTALL_DIR_BASE ${PLUGINS_DIR}
OSX_INSTALL_RPATH
@loader_path/../../Contents/MacOS
@loader_path/../../Contents/Frameworks
LINUX_INSTALL_RPATH "\$ORIGIN/../../${LIB_DIR}"
)
mtd_add_qt_library(
TARGET_NAME MantidScientificInterfacesISISReflectometry
QT_VERSION 5
......
......@@ -154,50 +154,6 @@ set(
set(UI_FILES inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.ui)
# Target
mtd_add_qt_library(TARGET_NAME MantidQtWidgetsInstrumentView
QT_VERSION 4
SRC
${SRC_FILES}
${QT4_SRC_FILES}
MOC
${MOC_FILES}
${QT4_MOC_FILES}
NOMOC
${INC_FILES}
${QT4_INC_FILES}
UI
${UI_FILES}
RES
../../../images/instrumentview.qrc
DEFS
IN_MANTIDQT_INSTRUMENTVIEW
INCLUDE_DIRS
inc
../../../Framework/DataObjects/inc
SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
LINK_LIBS
${CORE_MANTIDLIBS}
DataObjects
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
QT4_LINK_LIBS
Qt4::QtOpenGL
Qwt5
MTD_QT_LINK_LIBS
MantidQtWidgetsCommon
MantidQtWidgetsPlotting
INSTALL_DIR
${LIB_DIR}
OSX_INSTALL_RPATH
@loader_path/../MacOS
@loader_path/../Frameworks
LINUX_INSTALL_RPATH
"\$ORIGIN/../${LIB_DIR}")
mtd_add_qt_library(TARGET_NAME MantidQtWidgetsInstrumentView
QT_VERSION 5
SRC
......
......@@ -56,31 +56,6 @@ include_directories(
inc/MantidQtWidgets/Plugins/AlgorithmDialogs
)
mtd_add_qt_library(
TARGET_NAME MantidQtWidgetsPluginsAlgorithmDialogs
QT_VERSION 4
SRC ${SRC_FILES}
MOC ${MOC_FILES}
NOMOC ${INC_FILES}
UI
${UI_FILES}
PRECOMPILED
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
LINK_LIBS
${CORE_MANTIDLIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${QT_LIBRARIES}
${OPENGL_LIBRARIES}
QT4_LINK_LIBS Qt4::QtOpenGL Qt4::Qscintilla
MTD_QT_LINK_LIBS MantidQtWidgetsCommon
OSX_INSTALL_RPATH @loader_path/../../Contents/MacOS
LINUX_INSTALL_RPATH "\$ORIGIN/../../${LIB_DIR}"
INSTALL_DIR_BASE ${PLUGINS_DIR}
)
mtd_add_qt_library(
TARGET_NAME MantidQtWidgetsPluginsAlgorithmDialogs
QT_VERSION 5
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment