From d0533f32357a078f8765caff293be530b3ed520d Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 1 Nov 2018 14:32:00 +0100 Subject: [PATCH] Fixup for supporting system installed HDF5 and Eigen --- external/external_build.cmake | 7 +++++-- src/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/external/external_build.cmake b/external/external_build.cmake index 48ce837..5032b35 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -25,7 +25,7 @@ MACRO(CHECK_CHANGE_STATE VAR) ENDMACRO(CHECK_CHANGE_STATE) CHECK_CHANGE_STATE(INTERNAL_BOOST Boost_LIBRARIES Boost_INCLUDE_DIRS) -CHECK_CHANGE_STATE(INTERNAL_EIGEN EIGEN3_INCLUDE_DIRS) +CHECK_CHANGE_STATE(INTERNAL_EIGEN EIGEN3_INCLUDEDIR) CHECK_CHANGE_STATE(INTERNAL_GSL GSL_LIBRARY GSL_CBLAS_LIBRARY GSL_INCLUDE) CHECK_CHANGE_STATE(INTERNAL_HDF5 HDF5_INCLUDE_DIR HDF5_LIBRARIES HDF5_CXX_LIBRARIES @@ -338,7 +338,7 @@ IF (INTERNAL_EIGEN) -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ) - SET(EIGEN3_INCLUDE_DIRS ${EXT_INSTALL}/include/eigen3) + SET(EIGEN3_INCLUDEDIR ${EXT_INSTALL}/include/eigen3) ELSE (INTERNAL_EIGEN) if(DEFINED EIGEN_PATH) @@ -352,6 +352,9 @@ ELSE (INTERNAL_EIGEN) if (NOT EIGEN3_FOUND) cmessage(CWARNING "Eigen library not found") else() + IF(EIGEN3_STATIC_INCLUDE_DIRS) + SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_STATIC_INCLUDE_DIRS}) + ENDIF() cmessage(STATUS "Found EIGEN3 in ${EIGEN3_INCLUDE_DIRS}") endif() ENDIF(INTERNAL_EIGEN) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b9c1dc2..bc7ae98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,7 +40,7 @@ if (HDF5_FOUND) ) target_include_directories(CosmoHDF5 BEFORE PRIVATE ${HDF5_INCLUDE_DIR}) else(HDF5_FOUND) - add_library(CosmoHdf5 OBJECT + add_library(CosmoHDF5 OBJECT loadFlash_dummy.cpp ) endif (HDF5_FOUND)