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/cmake/modules/GUDHI_modules.cmake | |
| parent | d33eaa80b7c337fde11bb5db60df79fbc81fb483 (diff) | |
| parent | ad5d38986542715e0a0518537afaadcda71d9c49 (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") |