Merge branch 'master' into export_3mf

pull/1598/head
Kim Kulling 2017-11-28 15:41:33 +01:00 committed by GitHub
commit e442f5838f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -46,7 +46,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
if [ $ANALYZE = "ON" ] ; then if [ $ANALYZE = "ON" ] ; then
if [ "$CC" = "clang" ]; then if [ "$CC" = "clang" ]; then
scan-build cmake -G "Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_TESTS=OFF scan-build cmake -G "Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_TESTS=OFF
scan-build --status-bugs make -j2 scan-build --status-bugs make -j2 -v
else else
cppcheck --version cppcheck --version
generate \ generate \