From a9c5b6f1be3cfc75208937eda2cdd38c65769056 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 17 Nov 2016 19:57:24 +0100 Subject: [PATCH] Ensure that filelist for assimp lib is not empty for coveralls. --- code/CMakeLists.txt | 12 ++++++++++++ test/CMakeLists.txt | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3f0b696..7f42d9e 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -928,3 +928,15 @@ if(MSVC AND ASSIMP_INSTALL_PDB) CONFIGURATIONS RelWithDebInfo ) endif () + +if (ASSIMP_COVERALLS) + include(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-modules/") # (Optional) Alternate project cmake module path. +endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e7beee4..e227e21 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -122,15 +122,15 @@ ENDIF( WIN32 ) target_link_libraries( unit assimp ${platform_libs} ) add_subdirectory(headercheck) -if (ASSIMP_COVERALLS) - include(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-modules/") # (Optional) Alternate project cmake module path. -endif() +#if (ASSIMP_COVERALLS) +# include(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-modules/") # (Optional) Alternate project cmake module path. +#endif() -- 2.7.4