v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1465 from turol/warnings 

Make Travis treat warnings as errors
pull/1469/head
Kim Kulling 2017-10-01 20:01:24 +02:00 committed by GitHub
parent c4e91eb33f f7b2380f86
commit 94860ff66e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.sh
View File

@ -1,6 +1,6 @@
function generate() function generate()
{ {
cmake -G "Unix Makefiles" -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DASSIMP_COVERALLS=$ENABLE_COVERALLS cmake -G "Unix Makefiles" -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DASSIMP_COVERALLS=$ENABLE_COVERALLS -DASSIMP_ERROR=ON
} }
if [ $ANDROID ]; then if [ $ANDROID ]; then

2
CMakeLists.txt
View File

@ -78,7 +78,7 @@ OPTION ( ASSIMP_COVERALLS
"Enable this to measure test coverage." "Enable this to measure test coverage."
OFF OFF
) )
OPTION ( ASSIMP_WERRRO OPTION ( ASSIMP_WERROR
"Treat warnings as errors." "Treat warnings as errors."
OFF OFF
) )

2
contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
View File

@ -425,7 +425,7 @@ namespace o3dgc
const AdjacencyInfo & v2T = m_triangleListDecoder.GetVertexToTriangle(); const AdjacencyInfo & v2T = m_triangleListDecoder.GetVertexToTriangle();
const T * const triangles = ifs.GetCoordIndex(); const T * const triangles = ifs.GetCoordIndex();
Vec3<long> p1, p2, p3, n0, nt; Vec3<long> p1, p2, p3, n0, nt;
long na0, nb0; long na0 = 0, nb0 = 0;
Real rna0, rnb0, norm0; Real rna0, rnb0, norm0;
char ni0 = 0, ni1 = 0; char ni0 = 0, ni1 = 0;
long a, b, c; long a, b, c;

4
contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
View File

@ -762,8 +762,8 @@ namespace o3dgc
const Real * const originalNormals = ifs.GetNormal(); const Real * const originalNormals = ifs.GetNormal();
Vec3<long> p1, p2, p3, n0, nt; Vec3<long> p1, p2, p3, n0, nt;
Vec3<Real> n1; Vec3<Real> n1;
long na0, nb0; long na0 = 0, nb0 = 0;
Real rna0, rnb0, na1, nb1, norm0, norm1; Real rna0, rnb0, na1 = 0, nb1 = 0, norm0, norm1;
char ni0 = 0, ni1 = 0; char ni0 = 0, ni1 = 0;
long a, b, c, v; long a, b, c, v;
m_predictors.Clear(); m_predictors.Clear();