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/cmake/modules/GUDHI_modules.cmake | |
parent | 4186971033ee43821905cac53791bf074751d3af (diff) | |
parent | 6b995c03793096459a333c907b606770113b96d7 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'src/cmake/modules/GUDHI_modules.cmake')
-rw-r--r-- | src/cmake/modules/GUDHI_modules.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cmake/modules/GUDHI_modules.cmake b/src/cmake/modules/GUDHI_modules.cmake index aab1dd08..ccaf1ac5 100644 --- a/src/cmake/modules/GUDHI_modules.cmake +++ b/src/cmake/modules/GUDHI_modules.cmake @@ -30,7 +30,12 @@ if (WITH_GUDHI_EXAMPLE) set(GUDHI_SUB_DIRECTORIES "${GUDHI_SUB_DIRECTORIES};example") endif() if (WITH_GUDHI_TEST) - set(GUDHI_SUB_DIRECTORIES "${GUDHI_SUB_DIRECTORIES};test") + # All tests are using boost tests + if(TARGET Boost::unit_test_framework) + set(GUDHI_SUB_DIRECTORIES "${GUDHI_SUB_DIRECTORIES};test") + else() + message("++ WITH_GUDHI_TEST but no TARGET Boost::unit_test_framework") + endif() endif() if (WITH_GUDHI_UTILITIES) set(GUDHI_SUB_DIRECTORIES "${GUDHI_SUB_DIRECTORIES};utilities") |