Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
99d80b0f
Commit
99d80b0f
authored
8 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Update ParaView to v5.3.0-RC1.
parent
413f0812
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
buildconfig/Jenkins/buildscript
+2
-2
2 additions, 2 deletions
buildconfig/Jenkins/buildscript
buildconfig/Jenkins/buildscript.bat
+2
-3
2 additions, 3 deletions
buildconfig/Jenkins/buildscript.bat
with
4 additions
and
5 deletions
buildconfig/Jenkins/buildscript
+
2
−
2
View file @
99d80b0f
...
@@ -28,9 +28,9 @@ if [[ ${NODE_LABELS} == *osx* ]]; then
...
@@ -28,9 +28,9 @@ if [[ ${NODE_LABELS} == *osx* ]]; then
fi
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
# Print out the versions of things we are using
...
...
This diff is collapsed.
Click to expand it.
buildconfig/Jenkins/buildscript.bat
+
2
−
3
View file @
99d80b0f
...
@@ -8,8 +8,7 @@ setlocal enableextensions enabledelayedexpansion
...
@@ -8,8 +8,7 @@ setlocal enableextensions enabledelayedexpansion
:: BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave.
:: BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave.
:: CMake, git & git-lfs should be on the PATH
:: CMake, git & git-lfs should be on the PATH
::
::
:: All nodes currently have PARAVIEW_DIR=5.1.0, PARAVIEW_NEXT_DIR=5.0.0
:: All nodes currently have PARAVIEW_DIR=5.2.0 and PARAVIEW_NEXT_DIR=5.3.0-RC1
:: and PARAVIEW_MSVC2015_DIR=4.3.b40280-msvc2015
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call
cmake
.exe
--version
call
cmake
.exe
--version
set
VS_VERSION
=
14
set
VS_VERSION
=
14
...
@@ -28,7 +27,7 @@ echo %sha1%
...
@@ -28,7 +27,7 @@ echo %sha1%
set
VS_VERSION
=
14
set
VS_VERSION
=
14
call
"
%VS1
40COMNTOOLS
%
\..\..\VC\vcvarsall.bat"
amd64
call
"
%VS1
40COMNTOOLS
%
\..\..\VC\vcvarsall.bat"
amd64
set
CM_GENERATOR
=
Visual
Studio
14
2015
Win64
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
:: Set up the location for local object store outside of the build and source
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment