diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
| commit | af5af2df409576035f2e31564f4048278d4f0f19 (patch) | |
| tree | 44fde353aa1e7c41e680c153182af0933b489487 /src/Cech_complex/utilities | |
| parent | 4186971033ee43821905cac53791bf074751d3af (diff) | |
| parent | 6b995c03793096459a333c907b606770113b96d7 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to 'src/Cech_complex/utilities')
| -rw-r--r-- | src/Cech_complex/utilities/CMakeLists.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/Cech_complex/utilities/CMakeLists.txt b/src/Cech_complex/utilities/CMakeLists.txt index 253d7304..b183c8d8 100644 --- a/src/Cech_complex/utilities/CMakeLists.txt +++ b/src/Cech_complex/utilities/CMakeLists.txt @@ -1,14 +1,15 @@ -cmake_minimum_required(VERSION 2.6) project(Cech_complex_utilities) -add_executable(cech_persistence cech_persistence.cpp) -target_link_libraries(cech_persistence Boost::program_options) +if (TARGET Boost::program_options) + add_executable(cech_persistence cech_persistence.cpp) + target_link_libraries(cech_persistence Boost::program_options) -if (TBB_FOUND) - target_link_libraries(cech_persistence ${TBB_LIBRARIES}) -endif() + if (TBB_FOUND) + target_link_libraries(cech_persistence ${TBB_LIBRARIES}) + endif() -add_test(NAME Cech_complex_utility_from_rips_on_tore_3D COMMAND $<TARGET_FILE:cech_persistence> - "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off" "-r" "0.25" "-m" "0.5" "-d" "3" "-p" "3") + add_test(NAME Cech_complex_utility_from_rips_on_tore_3D COMMAND $<TARGET_FILE:cech_persistence> + "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off" "-r" "0.25" "-m" "0.5" "-d" "3" "-p" "3") -install(TARGETS cech_persistence DESTINATION bin) + install(TARGETS cech_persistence DESTINATION bin) +endif()
\ No newline at end of file |