diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-02-19 17:21:57 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-02-19 17:21:57 +0000 |
| commit | 9164d35f155ea9512a885f0d86550f64156cf57a (patch) | |
| tree | 11278e44df37e680af3c8f502c955e8c7d548456 /src/common/test | |
| parent | 9781709e1c8ba405140345ba2e7d3e521e533e16 (diff) | |
| parent | 258ea460177a77c5d2cb45d623400cef2f7e0833 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@1032 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0e5b89e0ea0d69ebfdb74ba3bbf29518f7ce5ce8
Diffstat (limited to 'src/common/test')
| -rw-r--r-- | src/common/test/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt index a395338e..50655a93 100644 --- a/src/common/test/CMakeLists.txt +++ b/src/common/test/CMakeLists.txt @@ -1,19 +1,18 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIDelaunayTriangulationOffFileReadWriteUT) -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") +if (GCOVR_PATH) + # for gcovr to make coverage reports - Corbera Jenkins plugin + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") +endif() +if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") endif() # need CGAL 4.6 if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.6.0) - message(STATUS "CGAL version: ${CGAL_VERSION}.") - - include( ${CGAL_USE_FILE} ) - find_package(Eigen3 3.1.0) if (EIGEN3_FOUND) message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.") |