From 6bd5a7ced669d197a8d00235c21429e411f90bfa Mon Sep 17 00:00:00 2001 From: Umberto Lupo Date: Wed, 29 Dec 2021 10:31:26 +0100 Subject: [PATCH] Remove eigen submodule and various target_include_directories from CMakeLists --- .gitmodules | 3 --- CMakeLists.txt | 11 ----------- gtda/externals/eigen | 1 - 3 files changed, 15 deletions(-) delete mode 160000 gtda/externals/eigen diff --git a/.gitmodules b/.gitmodules index 9544dff8..7079c110 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,9 +5,6 @@ [submodule "gtda/externals/hera"] path = gtda/externals/hera url = https://github.com/grey-narn/hera -[submodule "gtda/externals/eigen"] - path = gtda/externals/eigen - url = https://gitlab.com/libeigen/eigen [submodule "gtda/externals/pybind11"] path = gtda/externals/pybind11 url = https://github.com/pybind/pybind11 diff --git a/CMakeLists.txt b/CMakeLists.txt index aa4b4479..f475a3fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ find_package(OpenMP) set(GUDHI_SRC_DIR "gtda/externals/gudhi-devel/src") set(HERA_DIR "gtda/externals/hera") -set(EIGEN_DIR "gtda/externals/eigen") ####################################################################### # Wasserstein # @@ -127,8 +126,6 @@ target_include_directories(gtda_simplex_tree PRIVATE "${GUDHI_SRC_DIR}/Cech_comp target_include_directories(gtda_simplex_tree PRIVATE "${GUDHI_SRC_DIR}/Persistent_cohomology/include") target_include_directories(gtda_simplex_tree PRIVATE "${GUDHI_SRC_DIR}/Subsampling/include") target_include_directories(gtda_simplex_tree PRIVATE "${GUDHI_SRC_DIR}/python/include") -target_include_directories(gtda_simplex_tree PRIVATE "${GUDHI_SRC_DIR}/Collapse/include") -target_include_directories(gtda_simplex_tree PRIVATE "${EIGEN_DIR}") if(MSVC) target_compile_options(gtda_simplex_tree PUBLIC $<$: /O2 /Wall /fp:strict>) @@ -185,8 +182,6 @@ target_include_directories(gtda_witness_complex PRIVATE "${GUDHI_SRC_DIR}/Cech_c target_include_directories(gtda_witness_complex PRIVATE "${GUDHI_SRC_DIR}/Persistent_cohomology/include") target_include_directories(gtda_witness_complex PRIVATE "${GUDHI_SRC_DIR}/python/include") target_include_directories(gtda_witness_complex PRIVATE "${GUDHI_SRC_DIR}/common/include") -target_include_directories(gtda_witness_complex PRIVATE "${GUDHI_SRC_DIR}/Collapse/include") -target_include_directories(gtda_witness_complex PRIVATE "${EIGEN_DIR}") if(MSVC) target_compile_options(gtda_witness_complex PUBLIC $<$: /O2 /Wall /fp:strict>) @@ -216,8 +211,6 @@ target_include_directories(gtda_strong_witness_complex PRIVATE "${GUDHI_SRC_DIR} target_include_directories(gtda_strong_witness_complex PRIVATE "${GUDHI_SRC_DIR}/Persistent_cohomology/include") target_include_directories(gtda_strong_witness_complex PRIVATE "${GUDHI_SRC_DIR}/python/include") target_include_directories(gtda_strong_witness_complex PRIVATE "${GUDHI_SRC_DIR}/common/include") -target_include_directories(gtda_strong_witness_complex PRIVATE "${GUDHI_SRC_DIR}/Collapse/include") -target_include_directories(gtda_strong_witness_complex PRIVATE "${EIGEN_DIR}") if(MSVC) target_compile_options(gtda_strong_witness_complex PUBLIC $<$: /O2 /Wall /fp:strict>) @@ -248,8 +241,6 @@ target_include_directories(gtda_sparse_rips_complex PRIVATE "${GUDHI_SRC_DIR}/Pe target_include_directories(gtda_sparse_rips_complex PRIVATE "${GUDHI_SRC_DIR}/Rips_complex/include") target_include_directories(gtda_sparse_rips_complex PRIVATE "${GUDHI_SRC_DIR}/Subsampling/include") target_include_directories(gtda_sparse_rips_complex PRIVATE "${GUDHI_SRC_DIR}/python/include") -target_include_directories(gtda_sparse_rips_complex PRIVATE "${GUDHI_SRC_DIR}/Collapse/include") -target_include_directories(gtda_sparse_rips_complex PRIVATE "${EIGEN_DIR}") if(MSVC) target_compile_options(gtda_sparse_rips_complex PUBLIC $<$: /O2 /Wall /fp:strict>) @@ -278,8 +269,6 @@ target_include_directories(gtda_cech_complex PRIVATE "${GUDHI_SRC_DIR}/Cech_comp target_include_directories(gtda_cech_complex PRIVATE "${GUDHI_SRC_DIR}/Persistent_cohomology/include") target_include_directories(gtda_cech_complex PRIVATE "${GUDHI_SRC_DIR}/python/include") target_include_directories(gtda_cech_complex PRIVATE "${GUDHI_SRC_DIR}/common/include") -target_include_directories(gtda_cech_complex PRIVATE "${GUDHI_SRC_DIR}/Collapse/include") -target_include_directories(gtda_cech_complex PRIVATE "${EIGEN_DIR}") if(MSVC) target_compile_options(gtda_cech_complex PUBLIC $<$: /O2 /Wall /fp:strict>) diff --git a/gtda/externals/eigen b/gtda/externals/eigen deleted file mode 160000 index 25424d91..00000000 --- a/gtda/externals/eigen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25424d91f60a9f858e7dc1c7936021cc1dd72019