From: Kim Kulling Date: Wed, 16 Nov 2016 15:11:30 +0000 (+0100) Subject: Still working on config. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c5e475d14bd631260c8ce2ad732abb4e8d0a81e;p=platform%2Fupstream%2Fassimp.git Still working on config. --- diff --git a/.travis.sh b/.travis.sh index 3583c28..c224eed 100755 --- a/.travis.sh +++ b/.travis.sh @@ -1,6 +1,6 @@ function generate() { - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DCOVERALLS=$ENABLE_COVERALLS + cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DASSIMP_COVERALLS=$ENABLE_COVERALLS } if [ $ANDROID ]; then diff --git a/.travis.yml b/.travis.yml index 6dbd343..420f9b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,8 @@ before_script: - lcov --directory . --zerocounters script: + - export COVERALLS_SERVICE_NAME=travis-ci + - export COVERALLS_REPO_TOKEN=abc12345 - . ./.travis.sh after_success: diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3f0b696..e424668 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -928,3 +928,13 @@ if(MSVC AND ASSIMP_INSTALL_PDB) CONFIGURATIONS RelWithDebInfo ) endif () + +if (ASSIMP_COVERALLS) + set(COVERAGE_SRCS ${assimp_src} ) + + # Create the coveralls target. + coveralls_setup( + "${COVERAGE_SRCS}" # The source files. + ON # If we should upload. + "${PROJECT_SOURCE_DIR}/cmake/") # (Optional) Alternate project cmake module path. +endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3db299a..6cdab1c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -122,13 +122,4 @@ ENDIF( WIN32 ) target_link_libraries( unit assimp ${platform_libs} ) add_subdirectory(headercheck) -if (ASSIMP_COVERALLS) - set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} ) - - # Create the coveralls target. - coveralls_setup( - "${COVERAGE_SRCS}" # The source files. - ON # If we should upload. - "${PROJECT_SOURCE_DIR}/cmake/") # (Optional) Alternate project cmake module path. -endif()