Enable coveralls measurement

diff --git a/.travis.yml b/.travis.yml
index df6e842..a794ff4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,10 @@ env:
   global:
     - PV=r8e PLATF=linux-x86_64 NDK_HOME=${TRAVIS_BUILD_DIR}/android-ndk-${PV} PATH=${PATH}:${NDK_HOME}
   matrix:
-    - LINUX=1 TRAVIS_NO_EXPORT=YES
-    - LINUX=1 TRAVIS_NO_EXPORT=NO
-    - LINUX=1 SHARED_BUILD=ON
-    - LINUX=1 SHARED_BUILD=OFF
+    - LINUX=1 TRAVIS_NO_EXPORT=YES ASSIMP_COVERALLS=ON
+    - LINUX=1 TRAVIS_NO_EXPORT=NO  ASSIMP_COVERALLS=ON
+    - LINUX=1 SHARED_BUILD=ON      ASSIMP_COVERALLS=ON
+    - LINUX=1 SHARED_BUILD=OFF     ASSIMP_COVERALLS=ON
     - ANDROID=1
 
 language: cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d352b95..cd6838d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,11 @@ OPTION ( ASSIMP_BUILD_TESTS
   "If the test suite for Assimp is built in addition to the library."
   ON
 )
+OPTION ( ASSIMP_COVERALLS
+   "Eańable this to measure test coverage."
+   OFF
+)
+
 IF(MSVC)
   set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
   OPTION( ASSIMP_INSTALL_PDB
@@ -173,7 +178,7 @@ ELSEIF( CMAKE_COMPILER_IS_MINGW )
        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" )
 ENDIF()
 
-if (COVERALLS)
+if (ASSIMP_COVERALLS)
     include(Coveralls)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bdea8df..3db299a 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -122,7 +122,7 @@ ENDIF( WIN32 )
 target_link_libraries( unit assimp ${platform_libs} )
 
 add_subdirectory(headercheck)
-if (COVERALLS)
+if (ASSIMP_COVERALLS)
     set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} )
 
     # Create the coveralls target.