diff options
| author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-04 11:56:16 +0000 |
|---|---|---|
| committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-04 11:56:16 +0000 |
| commit | e129379cf8a173b70ab123be668f4c67edf6f2a1 (patch) | |
| tree | d9ea793ab3a9204b0243624539c3257f46a29a24 /src | |
| parent | b88f70af2f4b61cf47bb90962dee3cc6096d72ec (diff) | |
Adding corrections to cmake files.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2396 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 56eaad66d3c21f84e4965c13f2596739825fc861
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Gudhi_stat/test/CMakeLists.txt | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d0e5d5d5..678303de 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,7 +53,11 @@ add_subdirectory(example/Subsampling) add_subdirectory(example/Tangential_complex) add_subdirectory(example/Bottleneck_distance) add_subdirectory(example/Gudhi_stat) -add_subdirectory(utilities/Gudhi_stat) +add_subdirectory(utilities/Gudhi_stat/persistence_heat_maps) +add_subdirectory(utilities/Gudhi_stat/persistence_intervals) +add_subdirectory(utilities/Gudhi_stat/persistence_landscapes) +add_subdirectory(utilities/Gudhi_stat/persistence_landscapes_on_grid) +add_subdirectory(utilities/Gudhi_stat/persistence_vectors) # data points generator add_subdirectory(data/points/generator) diff --git a/src/Gudhi_stat/test/CMakeLists.txt b/src/Gudhi_stat/test/CMakeLists.txt index ba457d5d..ab2b1cc3 100644 --- a/src/Gudhi_stat/test/CMakeLists.txt +++ b/src/Gudhi_stat/test/CMakeLists.txt @@ -86,17 +86,6 @@ add_test(NAME read_persistence_from_file_test # XML format for Jenkins xUnit plugin --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/read_persistence_from_file_UT.xml --log_level=test_suite --report_level=no) -file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) -add_executable ( additional_tests additional_tests.cpp ) -target_link_libraries(additional_tests ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) - -# Unitary tests -add_test(NAME additional_tests - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/additional_tests - file(COPY data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/additional_tests/data") - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/additional_tests_UT.xml --log_level=test_suite --report_level=no) - if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) |