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
0119ba6b
Commit
0119ba6b
authored
6 years ago
by
Gigg, Martyn Anthony
Committed by
Martyn Gigg
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix check for grep.exe in Windows buildscript
parent
527b67fc
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/Jenkins/setupcompiler.bat
+7
-1
7 additions, 1 deletion
buildconfig/Jenkins/setupcompiler.bat
with
7 additions
and
1 deletion
buildconfig/Jenkins/setupcompiler.bat
+
7
−
1
View file @
0119ba6b
...
...
@@ -4,7 +4,9 @@
::
:: On exit the CM_GENERATOR variable will be set appropriately.
:: If the previous compiler does not match this then the
:: CLEANBUILD flag is also set to yes
:: CLEANBUILD flag is also set to yes. It assumes it will be called from
:: a parent with "setlocal enableextensions enabledelayedexpansion" are set
:: in the parent
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Find grep
...
...
@@ -59,3 +61,7 @@ if EXIST %_builddir%\CMakeCache.txt (
echo
Previous
build
used
the
same
compiler
.
No
need
to
clean
.
)
)
:: Make sure we exit cleanly at this point as we could pick up the error
:: state from the "failed grep" in the CLEABUILD=yes case
exit
/b
0
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