Remove last mention of mantidplot in the build system

CMakeLists.txt

@@ -29,11 +29,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/buildconfig/CMake")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 
-option(ENABLE_MANTIDPLOT "Enable Qt4-based gui & components" OFF)
 option(ENABLE_WORKBENCH "Enable Qt5-based gui & components" ON)
-if(ENABLE_MANTIDPLOT)
-  message( FATAL_ERROR "MantidPlot has been removed from the source code")
-endif()
 
 set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR}" "Mantid" "ALL" "/")
 

CMakePresets.json

@@ -62,7 +62,6 @@
                 "CMAKE_BUILD_TYPE": "Release",
                 "ENABLE_PRECOMMIT": "OFF",
                 "ENABLE_CPACK": "ON",
-                "ENABLE_MANTIDPLOT": "OFF",
                 "DOCS_HTML": "ON",
                 "ENABLE_CONDA": "ON",
                 "COLORED_COMPILER_OUTPUT": "OFF"
@@ -82,7 +81,6 @@
                 "CMAKE_BUILD_TYPE": "RelWithDebInfo",
                 "ENABLE_PRECOMMIT": "OFF",
                 "ENABLE_CPACK": "ON",
-                "ENABLE_MANTIDPLOT": "OFF",
                 "DOCS_HTML": "ON",
                 "ENABLE_CONDA": "ON",
                 "COLORED_COMPILER_OUTPUT": "OFF",
@@ -103,7 +101,6 @@
                 "CMAKE_BUILD_TYPE": "RelWithDebInfo",
                 "ENABLE_PRECOMMIT": "OFF",
                 "ENABLE_CPACK": "ON",
-                "ENABLE_MANTIDPLOT": "OFF",
                 "DOCS_HTML": "ON",
                 "ENABLE_CONDA": "ON",
                 "COLORED_COMPILER_OUTPUT": "OFF",
@@ -124,7 +121,6 @@
                 "CMAKE_BUILD_TYPE": "RelWithDebInfo",
                 "ENABLE_PRECOMMIT": "OFF",
                 "ENABLE_CPACK": "ON",
-                "ENABLE_MANTIDPLOT": "OFF",
                 "DOCS_HTML": "ON",
                 "ENABLE_CONDA": "ON",
                 "COLORED_COMPILER_OUTPUT": "OFF",
@@ -145,7 +141,6 @@
                 "CMAKE_BUILD_TYPE": "Debug",
                 "ENABLE_PRECOMMIT": "OFF",
                 "ENABLE_CPACK": "ON",
-                "ENABLE_MANTIDPLOT": "OFF",
                 "DOCS_HTML": "ON",
                 "ENABLE_CONDA": "ON",
                 "COLORED_COMPILER_OUTPUT": "OFF",

buildconfig/CMake/WindowsNSIS.cmake

@@ -149,33 +149,3 @@ if(ENABLE_WORKBENCH)
     ${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}
   ")
 endif()
-
-# MantidPlot
-if(ENABLE_MANTIDPLOT)
-  set( WINDOWS_NSIS_MANTIDPLOT_ICON_NAME "${PACKAGE_ICON_BASENAME}" )
-  set( MANTIDPLOT_LINK_NAME "Mantid Plot ${CPACK_PACKAGE_SUFFIX_CAMELCASE}.lnk" )
-  include( WindowsNSISQt4 )
-  install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_mantidplot.bat DESTINATION bin )
-  install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_mantidplot.vbs DESTINATION bin )
-  # shortcuts
-  set (CPACK_NSIS_CREATE_ICONS_EXTRA "
-  CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico'
-
-  ${CPACK_NSIS_CREATE_ICONS_EXTRA}
-")
-
-  set (CPACK_NSIS_DELETE_ICONS_EXTRA "
-  Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\${MANTIDPLOT_LINK_NAME}\\\"
-  ${CPACK_NSIS_DELETE_ICONS_EXTRA}
-")
-  set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  CreateShortCut '$DESKTOP\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\${WINDOWS_NSIS_MANTIDPLOT_ICON_NAME}.ico'
-
-  ${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
-")
-  set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-  Delete \\\"$DESKTOP\\\\${MANTIDPLOT_LINK_NAME}\\\"
-  ${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}
-")
-
-endif()

buildconfig/Jenkins/buildscript

@@ -354,7 +354,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz
 ###############################################################################
 # CMake configuration
 ###############################################################################
-$SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_PRECOMMIT=OFF -DCOVERAGE=${COVERAGE} -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DCOLORED_COMPILER_OUTPUT=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} ${SANITIZER_FLAGS} .."
+$SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_PRECOMMIT=OFF -DCOVERAGE=${COVERAGE} -DENABLE_CPACK=ON -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DCOLORED_COMPILER_OUTPUT=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} ${SANITIZER_FLAGS} .."
 
 ###############################################################################
 # Coverity build should exit early

buildconfig/Jenkins/buildscript.bat

@@ -182,7 +182,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
 :: CMake configuration
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_PRECOMMIT=OFF -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% ..
+call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_PRECOMMIT=OFF -DENABLE_CPACK=ON -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% ..
 
 if ERRORLEVEL 1 exit /B %ERRORLEVEL%