diff --git a/CMakeLists.txt b/CMakeLists.txt index 14839c35ece36ec8f9541f65b4a36f2dfa599862..22a52df7805fe911efee14cb0a47b910b09de88b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,11 @@ set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" ) ########################################################################### include ( Eigen ) +########################################################################### +# Bootstrap any dependencies +########################################################################### +include ( Bootstrap ) + ########################################################################### # Set ParaView information since later items depend on it ########################################################################### @@ -56,11 +61,6 @@ if ( ENABLE_MANTIDPLOT ) include ( ParaViewSetup ) endif () -########################################################################### -# Bootstrap any dependencies -########################################################################### -include ( Bootstrap ) - ########################################################################### # Set expected variables for OS X ########################################################################### diff --git a/buildconfig/Jenkins/buildscript b/buildconfig/Jenkins/buildscript index 1fbd8652525e583cce842c9dadb926b0a5c3ebfb..8115027e3736563ff42564f460c8fa57b039f734 100755 --- a/buildconfig/Jenkins/buildscript +++ b/buildconfig/Jenkins/buildscript @@ -28,9 +28,9 @@ if [[ ${NODE_LABELS} == *osx* ]]; then fi ############################################################################### -# All nodes currently have PARAVIEW_DIR=5.2.0 and PARAVIEW_NEXT_DIR=5.1.2 +# All nodes currently have PARAVIEW_DIR=5.2.0 and PARAVIEW_NEXT_DIR=5.3.0-RC1 ############################################################################### -export PARAVIEW_DIR=${PARAVIEW_DIR} +export PARAVIEW_DIR=${PARAVIEW_NEXT_DIR} ############################################################################### # Print out the versions of things we are using diff --git a/buildconfig/Jenkins/buildscript.bat b/buildconfig/Jenkins/buildscript.bat index e7f9c2b39f165387fb56f38b222acc7d6b8aef4f..e8eb0d1a3ba758f72b7da8ecef329630f617e30b 100755 --- a/buildconfig/Jenkins/buildscript.bat +++ b/buildconfig/Jenkins/buildscript.bat @@ -8,8 +8,7 @@ setlocal enableextensions enabledelayedexpansion :: BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave. :: CMake, git & git-lfs should be on the PATH :: -:: All nodes currently have PARAVIEW_DIR=5.1.0, PARAVIEW_NEXT_DIR=5.0.0 -:: and PARAVIEW_MSVC2015_DIR=4.3.b40280-msvc2015 +:: All nodes currently have PARAVIEW_DIR=5.2.0 and PARAVIEW_NEXT_DIR=5.3.0-RC1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call cmake.exe --version set VS_VERSION=14 @@ -28,7 +27,7 @@ echo %sha1% set VS_VERSION=14 call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64 set CM_GENERATOR=Visual Studio 14 2015 Win64 -set PARAVIEW_DIR=%PARAVIEW_DIR% +set PARAVIEW_DIR=%PARAVIEW_NEXT_DIR% ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: Set up the location for local object store outside of the build and source diff --git a/docs/source/release/v3.10.0/ui.rst b/docs/source/release/v3.10.0/ui.rst index 3760a83001a16630b6692b8396e54dd38c0f88a8..ec933e261200fca3c7146c2f7d343a4e22612a69 100644 --- a/docs/source/release/v3.10.0/ui.rst +++ b/docs/source/release/v3.10.0/ui.rst @@ -39,6 +39,10 @@ Bugs Resolved SliceViewer Improvements ------------------------ +VSI Improvments +--------------- +Update ParaView to v5.3.0-RC1 + | Full list of