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
4186fc33
Commit
4186fc33
authored
9 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Optionally enable warnings about used Qt3Support functions.
parent
40e4a92a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-0
4 additions, 0 deletions
CMakeLists.txt
buildconfig/Jenkins/buildscript
+7
-18
7 additions, 18 deletions
buildconfig/Jenkins/buildscript
with
11 additions
and
18 deletions
CMakeLists.txt
+
4
−
0
View file @
4186fc33
...
...
@@ -71,6 +71,10 @@ include ( CommonSetup )
# Check for Qt (DarwinSetup below needs a variable from this)
###########################################################################
find_package
(
Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUIRED
)
option
(
WITH_QT3_SUPPORT_WARNINGS
"Enable warnings about used Qt3Support functions"
OFF
)
if
(
WITH_QT3_SUPPORT_WARNINGS
)
add_defintions
(
-DQT3_SUPPORT_WARNINGS
)
endif
()
###########################################################################
# Find OpenGL
...
...
This diff is collapsed.
Click to expand it.
buildconfig/Jenkins/buildscript
+
7
−
18
View file @
4186fc33
...
...
@@ -91,24 +91,6 @@ if [[ $USE_CLANG ]]; then
fi
fi
###############################################################################
# OS X 10.8 setup steps
###############################################################################
if
[[
$(
uname
)
==
'Darwin'
]]
&&
[[
!
$USE_CLANG
]]
;
then
# Assuming we are using the Intel compiler
cd
$WORKSPACE
./fetch_Third_Party.sh
cd
$WORKSPACE
# Setup environment variables
source
/opt/intel/bin/iccvars.sh intel64
export
DYLD_LIBRARY_PATH
=
$DYLD_LIBRARY_PATH
:
$WORKSPACE
/Third_Party/lib/mac64:/Library/Frameworks
# Make sure we pick up the Intel compiler
export
CC
=
icc
export
CXX
=
icpc
echo
"Using Intel compiler."
icpc
--version
fi
###############################################################################
# Set up the location for the local object store outside of the build and
# source tree, which can be shared by multiple builds.
...
...
@@ -138,6 +120,13 @@ if [[ ${NODE_LABELS} == *ubuntu* ]]; then
ON_UBUNTU
=
true
fi
###############################################################################
# Enable warnings about used Qt3Support functions
###############################################################################
if
[[
${
JOB_NAME
}
==
*
Qt3-warnings
*
]]
;
then
DIST_FLAGS
=
"
${
DIST_FLAGS
}
-DWITH_QT3SUPPORT_WARNINGS=ON"
fi
###############################################################################
# Packaging options
###############################################################################
...
...
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