Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
70dc53b6
Commit
70dc53b6
authored
Sep 08, 2021
by
Peterson, Peter
Browse files
Remove last mention of mantidplot in the build system
parent
3798a2f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
70dc53b6
...
...
@@ -30,11 +30,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"
"/"
)
...
...
buildconfig/CMake/WindowsNSIS.cmake
View file @
70dc53b6
...
...
@@ -144,33 +144,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
View file @
70dc53b6
...
...
@@ -348,7 +348,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 -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 -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
View file @
70dc53b6
...
...
@@ -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%
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment