diff options
| author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
|---|---|---|
| committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
| commit | 2b4bf47e209225a56687b2a7fa65b27ef4b00ab2 (patch) | |
| tree | e876553cc2f8c18e0f504a33b26230d0e3e491ed /src/CMakeLists.txt | |
| parent | 3253e504a0564bc75ffd4b1351e800593ffefd0f (diff) | |
| parent | 7fa45f4f0c7fb89abf64bc61b26a6201ace16a7a (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8023e04c..f9f77ef7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,8 +12,12 @@ set(GUDHI_MISSING_MODULES "" CACHE INTERNAL "GUDHI_MISSING_MODULES") # This variable is used by Cython CMakeLists.txt and by GUDHI_third_party_libraries to know its path set(GUDHI_PYTHON_PATH "python") -# For third parties libraries management - To be done last as CGAL updates CMAKE_MODULE_PATH -include(GUDHI_third_party_libraries NO_POLICY_SCOPE) +include(GUDHI_submodules) + +if (WITH_GUDHI_THIRD_PARTY) + # For third parties libraries management - To be done last as CGAL updates CMAKE_MODULE_PATH + include(GUDHI_third_party_libraries NO_POLICY_SCOPE) +endif() include(GUDHI_compilation_flags) @@ -67,7 +71,9 @@ foreach(GUDHI_MODULE ${GUDHI_MODULES}) endforeach() endforeach() -add_subdirectory(GudhUI) +if (WITH_GUDHI_THIRD_PARTY) + add_subdirectory(GudhUI) +endif() message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"") message("++ GUDHI_MISSING_MODULES list is:\"${GUDHI_MISSING_MODULES}\"") |