Преглед на файлове

Still working on config.

Kim Kulling преди 8 години
родител
ревизия
6c5e475d14
променени са 4 файла, в които са добавени 13 реда и са изтрити 10 реда
  1. 1 1
      .travis.sh
  2. 2 0
      .travis.yml
  3. 10 0
      code/CMakeLists.txt
  4. 0 9
      test/CMakeLists.txt

+ 1 - 1
.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

+ 2 - 0
.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:

+ 10 - 0
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()

+ 0 - 9
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()