diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
commit | 8b7a25482dfd9c38825e022d5f95135f0aade738 (patch) | |
tree | e986157f9921aa261a58c8d812f2802cab248310 /src/Collapse/test/CMakeLists.txt | |
parent | d33eaa80b7c337fde11bb5db60df79fbc81fb483 (diff) | |
parent | ad5d38986542715e0a0518537afaadcda71d9c49 (diff) |
merge master and resolve conflicts
Diffstat (limited to 'src/Collapse/test/CMakeLists.txt')
-rw-r--r-- | src/Collapse/test/CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Collapse/test/CMakeLists.txt b/src/Collapse/test/CMakeLists.txt index c7eafb46..c04199e2 100644 --- a/src/Collapse/test/CMakeLists.txt +++ b/src/Collapse/test/CMakeLists.txt @@ -1,9 +1,13 @@ project(Collapse_tests) -include(GUDHI_boost_test) +if (NOT EIGEN3_VERSION VERSION_LESS 3.1.0) -add_executable ( Collapse_test_unit collapse_unit_test.cpp ) -if (TBB_FOUND) - target_link_libraries(Collapse_test_unit ${TBB_LIBRARIES}) -endif() -gudhi_add_boost_test(Collapse_test_unit) + include(GUDHI_boost_test) + + add_executable ( Collapse_test_unit collapse_unit_test.cpp ) + if (TBB_FOUND) + target_link_libraries(Collapse_test_unit ${TBB_LIBRARIES}) + endif() + gudhi_add_boost_test(Collapse_test_unit) + +endif()
\ No newline at end of file |