Merge pull request #436 from andrewkaufman/cent7

CentOS 7 gcc 4.8.3 compatibilty

Author: johnhaddon

config/ie/buildAll

@@ -52,22 +52,22 @@ def installDocs() :
 
 		raise RuntimeError("Error : scons installDoc " + str( " ".join( buildArgs ) ) )
 
-if IEEnv.platform() == "cent6.x86_64" :
+if IEEnv.platform() in ( "cent6.x86_64", "cent7.x86_64" ) :
 
 	for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]): 
 		for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
 			build( [ "COMPILER_VERSION="+compilerVersion, "DL_VERSION=UNDEFINED", "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=4.0.9.1" ] )
 
 	for dlVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["3delight"] ):
-		for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
-			build( [ "COMPILER_VERSION=4.1.2", "DL_VERSION="+dlVersion, "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=UNDEFINED" ] )
+		for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]): 
+			for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
+				build( [ "COMPILER_VERSION="+compilerVersion, "DL_VERSION="+dlVersion, "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=UNDEFINED" ] )
 
 	for mayaVersion in IEEnv.activeAppVersions( "maya" ) :
-		build( [ "APP=maya", "APP_VERSION="+mayaVersion, "DL_VERSION=10.0.142", "ARNOLD_VERSION=4.0.9.1" ] )
+		build( [ "APP=maya", "APP_VERSION="+mayaVersion ] )
 
 	for nukeVersion in IEEnv.activeAppVersions( "nuke" ) :
-		if nukeVersion.startswith( "8" ) :
-			build( [ "APP=nuke", "APP_VERSION="+nukeVersion ] )
+		build( [ "APP=nuke", "APP_VERSION="+nukeVersion ] )
 
 	for houdiniVersion in IEEnv.activeAppVersions( "houdini" ) :
 		if houdiniVersion.startswith( "14" ) or ( houdiniVersion.startswith( "13" ) and houdiniVersion.endswith( "-python2.7" ) ) :

config/ie/options

@@ -194,15 +194,10 @@ JPEG_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, c
 TIFF_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
 FREETYPE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
 
+# we use the /usr/lib64 versions of tiff, png, freetype and jpeg
+# with the exception of freetype on CentOS 6.
 if platform == "cent6.x86_64" :
-	# use the /usr/lib versions of tiff, png, freetype and jpeg
 	FREETYPE_INCLUDE_PATH = "/usr/include/freetype2"
-else :
-	TIFF_INCLUDE_PATH = "/software/tools/include/tiff/3.8.2"
-	JPEG_INCLUDE_PATH = "/software/tools/include/jpeg/6b"
-	FREETYPE_INCLUDE_PATH = "/software/tools/include/freetype/2.3.5/freetype2"
-	PNG_INCLUDE_PATH = "/software/tools/include/png/1.5.2"
-	CXXFLAGS += [ "-isystem", "/software/tools/include/freetype/2.3.5" ]
 
 # figure out the boost lib suffix
 compilerVersionSplit = compilerVersion.split( "." )
@@ -334,7 +329,9 @@ if targetApp=="houdini" :
 
 	houdiniReg = IEEnv.registry["apps"]["houdini"][houdiniVersion][platform]
 	BOOST_INCLUDE_PATH = "/software/tools/include/" + platform + "/boost/" + boostVersion
-	PNG_INCLUDE_PATH = os.path.join( houdiniReg['location'], houdiniReg['includes'][0] )
+	
+	if "pngVersion" in houdiniReg :
+		PNG_INCLUDE_PATH = "/software/tools/include/" + platform + "/png/" + houdiniReg["pngVersion"]
 
 	HOUDINI_ROOT = houdiniReg['location']
 	HOUDINI_CXX_FLAGS = " ".join( CXXFLAGS ) + ' -DVERSION=\"'+houdiniVersion+'\" -DDLLEXPORT=  -D_GNU_SOURCE -DLINUX -DAMD64 -m64 -fPIC -DSIZEOF_VOID_P=8 -DSESI_LITTLE_ENDIAN -DENABLE_THREADS -DUSE_PTHREADS -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DGCC4 -DGCC3 -Wno-deprecated -Wno-reorder'

src/IECoreMaya/FromMayaImageConverter.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2009-2010, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2009-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -86,7 +86,7 @@ void FromMayaImageConverter::writeChannels( ImagePrimitivePtr target, const std:
 	assert( target );
 	unsigned numChannels = m_image.depth() / ( m_image.pixelType() == MImage::kFloat ? sizeof(float) : sizeof(unsigned char) );
 	unsigned width, height;
-	MStatus s = m_image.getSize( width, height );
+	m_image.getSize( width, height );
 	assert( width );
 	assert( height );
 
@@ -119,7 +119,7 @@ void FromMayaImageConverter::writeDepth( ImagePrimitivePtr target, const float *
 {
 	assert( target );
 	unsigned width, height;
-	MStatus s = m_image.getSize( width, height );
+	m_image.getSize( width, height );
 	assert( width );
 	assert( height );
 

src/IECoreMaya/FromMayaUnitPlugConverter.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2008-2012, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2008-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -150,7 +150,6 @@ template<typename T>
 IECore::ObjectPtr FromMayaUnitPlugConverter<T>::doConversion( IECore::ConstCompoundObjectPtr operands ) const
 {
 	typedef IECore::TypedData<T> ResultType;
-	typedef typename IECore::TypedData<T>::Ptr ResultTypePtr;
 
 	MObject attr = plug().attribute();
 	MFnUnitAttribute fnUAttr( attr );

src/IECoreMaya/LiveScene.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2013-2014, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2013-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -724,7 +724,7 @@ IECore::SceneInterfacePtr LiveScene::retrieveChild( const Name &name, MissingBeh
 	sel.add( m_dagPath.fullPathName() + "|" + std::string( name ).c_str() );
 
 	MDagPath path;
-	MStatus st = sel.getDagPath( 0, path );
+	sel.getDagPath( 0, path );
 
 	if( !path.hasFn( MFn::kTransform ) )
 	{

src/IECoreMaya/OpHolder.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2007-2011, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2007-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -113,7 +113,7 @@ void *OpHolder<B>::creator()
 template<typename B>
 MStatus OpHolder<B>::initialize()
 {
-	MStatus s = inheritAttributesFrom( ParameterisedHolder<B>::typeName );
+	MStatus s = OpHolder<B>::inheritAttributesFrom( ParameterisedHolder<B>::typeName );
 	if( !s )
 	{
 		return s;

src/IECoreMaya/ParameterisedHolder.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2007-2011, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2007-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -299,7 +299,7 @@ MStatus ParameterisedHolder<B>::setParameterised( const std::string &className,
 	MPlug pClassName( B::thisMObject(), aParameterisedClassName );
 	MPlug pVersion( B::thisMObject(), aParameterisedVersion );
 	MPlug pSearchPathEnvVar( B::thisMObject(), aParameterisedSearchPathEnvVar );
-	MStatus s = pClassName.setValue( className.c_str() );
+	pClassName.setValue( className.c_str() );
 	pVersion.setValue( classVersion );
 	pSearchPathEnvVar.setValue( searchPathEnvVar.c_str() );
 
@@ -331,7 +331,7 @@ IECore::RunTimeTypedPtr ParameterisedHolder<B>::getParameterised( std::string *c
 	int version;
 	MString searchPathEnvVar;
 
-	MStatus s = pClassName.getValue( className );
+	pClassName.getValue( className );
 
 	pVersion.getValue( version );
 	pSearchPathEnvVar.getValue( searchPathEnvVar );

src/IECoreMaya/SceneShapeInterface.cpp

@@ -781,7 +781,7 @@ MStatus SceneShapeInterface::compute( const MPlug &plug, MDataBlock &dataBlock )
 				{
 					m = coordSys->getTransform()->transform();
 				}
-				Imath::V3f s,h,r,t;
+				Imath::V3f s(0), h(0), r(0), t(0);
 				Imath::extractSHRT(m, s, h, r, t);
 
 				MFnNumericData fnData;

src/IECoreMaya/ToMayaLocatorConverter.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2013-2015, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -124,7 +124,7 @@ bool ToMayaLocatorConverter::doConversion( IECore::ConstObjectPtr from, MObject
 	{
 		m = transform->transform();
 	}
-	Imath::V3f s,h,r,t;
+	Imath::V3f s(0), h(0), r(0), t(0);
 	Imath::extractSHRT(m, s, h, r, t);
 
 	/// obtain local position and scale from locator