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
c141f350
Unverified
Commit
c141f350
authored
6 years ago
by
Savici, Andrei T.
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #23255 from rosswhitfield/remove_ENABLE_FILE_LOGGING_buildscript
Remove ENABLE_FILE_LOGGING from buildscript
parents
d6bb474a
4eaec1b4
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
buildconfig/Jenkins/buildscript
+1
-1
1 addition, 1 deletion
buildconfig/Jenkins/buildscript
buildconfig/Jenkins/buildscript.bat
+1
-1
1 addition, 1 deletion
buildconfig/Jenkins/buildscript.bat
with
2 additions
and
2 deletions
buildconfig/Jenkins/buildscript
+
1
−
1
View file @
c141f350
...
@@ -293,7 +293,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz
...
@@ -293,7 +293,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz
###############################################################################
###############################################################################
# CMake configuration
# CMake configuration
###############################################################################
###############################################################################
$SCL_ENABLE
"
${
CMAKE_EXE
}
${
CMAKE_GENERATOR
}
-DCMAKE_BUILD_TYPE=
${
BUILD_CONFIG
}
-DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=
${
PARAVIEW_DIR
}
-DMANTID_DATA_STORE=
${
MANTID_DATA_STORE
}
-DDOCS_HTML=ON -DENABLE_CONDA=ON -DENABLE_WORKBENCH=ON
-DENABLE_FILE_LOGGING=OFF
${
DIST_FLAGS
}
${
PACKAGINGVARS
}
${
CLANGTIDYVAR
}
.."
$SCL_ENABLE
"
${
CMAKE_EXE
}
${
CMAKE_GENERATOR
}
-DCMAKE_BUILD_TYPE=
${
BUILD_CONFIG
}
-DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=
${
PARAVIEW_DIR
}
-DMANTID_DATA_STORE=
${
MANTID_DATA_STORE
}
-DDOCS_HTML=ON -DENABLE_CONDA=ON -DENABLE_WORKBENCH=ON
${
DIST_FLAGS
}
${
PACKAGINGVARS
}
${
CLANGTIDYVAR
}
.."
###############################################################################
###############################################################################
# Coverity build should exit early
# Coverity build should exit early
...
...
This diff is collapsed.
Click to expand it.
buildconfig/Jenkins/buildscript.bat
+
1
−
1
View file @
c141f350
...
@@ -150,7 +150,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
...
@@ -150,7 +150,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
)
else
(
)
else
(
set
VATES_OPT_VAL
=
ON
set
VATES_OPT_VAL
=
ON
)
)
call
cmake
.exe
-G
"
%CM_GENERATOR%
"
-DCMAKE
_SYSTEM_VERSION
=
%SDK_VERSION%
-DCONSOLE
=
OFF
-DENABLE
_CPACK
=
ON
-DMAKE
_VATES
=
%VATES_OPT_VAL%
-DParaView
_DIR
=
%PARAVIEW_DIR%
-DMANTID
_DATA_STORE
=
!MANTID_DATA_STORE!
-DENABLE
_WORKBENCH
=
ON
-DUSE
_PRECOMPILED_HEADERS
=
ON
-DENABLE
_FILE_LOGGING
=
OFF
%PACKAGE_OPTS%
..
call
cmake
.exe
-G
"
%CM_GENERATOR%
"
-DCMAKE
_SYSTEM_VERSION
=
%SDK_VERSION%
-DCONSOLE
=
OFF
-DENABLE
_CPACK
=
ON
-DMAKE
_VATES
=
%VATES_OPT_VAL%
-DParaView
_DIR
=
%PARAVIEW_DIR%
-DMANTID
_DATA_STORE
=
!MANTID_DATA_STORE!
-DENABLE
_WORKBENCH
=
ON
-DUSE
_PRECOMPILED_HEADERS
=
ON
%PACKAGE_OPTS%
..
if
ERRORLEVEL
1
exit
/B
%ERRORLEVEL%
if
ERRORLEVEL
1
exit
/B
%ERRORLEVEL%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
...
...
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