Skip to content
Snippets Groups Projects
Commit 4186fc33 authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Optionally enable warnings about used Qt3Support functions.

parent 40e4a92a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
###############################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment