From 96655b6d805c24a74f40065e2d5ed884b9a51eff Mon Sep 17 00:00:00 2001 From: "Maarten L. Hekkelman" Date: Wed, 29 Jan 2025 17:12:59 +0100 Subject: [PATCH] revert --- CMakeLists.txt | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fd05da..dba933e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,29 +237,18 @@ if(Eigen3_FOUND AND TARGET Eigen3::Eigen) get_target_property(EIGEN_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) else() - if(CMAKE_VERSION GREATER_EQUAL 3.28) - FetchContent_Declare(my-eigen3 - GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_TAG 3.4.0 - EXCLUDE_FROM_ALL - ) - FetchContent_MakeAvailable(my-eigen3) - - get_target_property(EIGEN_INCLUDE_DIR Eigen3::Eigen - INTERFACE_INCLUDE_DIRECTORIES) - else() - # Use ExternalProject since FetchContent always tries to install the result... - ExternalProject_Add(my-eigen3 - GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_TAG 3.4.0 - INSTALL_COMMAND "" - CMAKE_ARGS "-DPROJECT_IS_TOP_LEVEL=OFF") - - ExternalProject_Get_Property(my-eigen3 SOURCE_DIR) - set(EIGEN_INCLUDE_DIR ${SOURCE_DIR}) - endif() + # Use ExternalProject since FetchContent always tries to install the result... + ExternalProject_Add(my-eigen3 + GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git + GIT_TAG 3.4.0 + INSTALL_COMMAND "") + + ExternalProject_Get_Property(my-eigen3 SOURCE_DIR) + set(EIGEN_INCLUDE_DIR ${SOURCE_DIR}) endif() +message(STATUS "Eigen include dir is ${EIGEN_INCLUDE_DIR}") + # Create a revision file, containing the current git version info include(VersionString) write_version_header(${CMAKE_CURRENT_SOURCE_DIR}/src/ LIB_NAME "LibCIFPP")