diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-16 14:38:36 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-16 14:38:36 +0000 |
| commit | e6078c1e4c7561f790afc653269cd3deca4c2350 (patch) | |
| tree | e55ed929e8ad4d7c2be0e7bd8999878df3485d7c /src/Skeleton_blocker | |
| parent | 54c6bc50795f53ff1a1227c098f0d4fe84a8d885 (diff) | |
| parent | 8e83a86b147987cc256812aff78335ac8a26c36e (diff) | |
Merge of cpplint branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@357 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8b6af51684401f4c45c953142aae90d6f45e6778
Diffstat (limited to 'src/Skeleton_blocker')
| -rw-r--r-- | src/Skeleton_blocker/example/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Skeleton_blocker/test/CMakeLists.txt | 18 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/Skeleton_blocker/example/CMakeLists.txt b/src/Skeleton_blocker/example/CMakeLists.txt index 0aed1e7a..c8e976cd 100644 --- a/src/Skeleton_blocker/example/CMakeLists.txt +++ b/src/Skeleton_blocker/example/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIskbl) -add_executable ( SkeletonBlockerIteration Skeleton_blocker_iteration.cpp ) - -target_link_libraries( SkeletonBlockerIteration ${Boost_TIMER_LIBRARY}) +add_executable(SkeletonBlockerIteration Skeleton_blocker_iteration.cpp) +target_link_libraries(SkeletonBlockerIteration ${Boost_TIMER_LIBRARY} ${Boost_SYSTEM_LIBRARY}) +add_test(SkeletonBlockerIteration ${CMAKE_CURRENT_BINARY_DIR}/SkeletonBlockerIteration) diff --git a/src/Skeleton_blocker/test/CMakeLists.txt b/src/Skeleton_blocker/test/CMakeLists.txt index d66dcf64..c341dcee 100644 --- a/src/Skeleton_blocker/test/CMakeLists.txt +++ b/src/Skeleton_blocker/test/CMakeLists.txt @@ -1,7 +1,21 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIskbl) -add_executable ( TestSkeletonBlockerComplex TestSkeletonBlockerComplex.cpp ) -add_executable ( TestSimplifiable TestSimplifiable.cpp ) +if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --coverage") +endif() +add_executable(TestSkeletonBlockerComplex TestSkeletonBlockerComplex.cpp) +add_executable(TestSimplifiable TestSimplifiable.cpp) +add_test(TestSkeletonBlockerComplex ${CMAKE_CURRENT_BINARY_DIR}/TestSkeletonBlockerComplex) +add_test(TestSimplifiable ${CMAKE_CURRENT_BINARY_DIR}/TestSimplifiable) + +if (LCOV_PATH) + # Lcov code coverage of unitary test + add_test(src/Skeleton_blocker/lcov/coverage.log ${CMAKE_SOURCE_DIR}/scripts/check_code_coverage.sh ${CMAKE_SOURCE_DIR}/src/Skeleton_blocker) +endif() + +cpplint_add_tests("${CMAKE_SOURCE_DIR}/src/Skeleton_blocker/include/gudhi") |