diff options
| author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-02-01 16:21:10 +0100 |
|---|---|---|
| committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-02-01 16:21:10 +0100 |
| commit | 15163959fd57ea5318e19a5613cc69bc3f0f6b9e (patch) | |
| tree | 183314a8b538bf6a39b81b20825e9416d66ae43e /src/CMakeLists.txt | |
| parent | 002487d3cd747d6ff979f33474d8bb0a7e61f44d (diff) | |
| parent | 7f1b8eb706c72921141b53e607d6e2aa28e2bf19 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f6a1ccc..8023e04c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.5) project(GUDHI) -include(CMakeGUDHIVersion.txt) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") +include(CMakeGUDHIVersion.txt) +include(GUDHI_options) set(GUDHI_MODULES "" CACHE INTERNAL "GUDHI_MODULES") set(GUDHI_MISSING_MODULES "" CACHE INTERNAL "GUDHI_MISSING_MODULES") |