guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of bitbucket.org:glavaux/cosmotool

Browse source
This commit is contained in:
Guilhem Lavaux 2019-01-31 16:02:20 +01:00
commit bc97f15f90
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
external/external_build.cmake vendored
View file

@ -26,7 +26,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
@ -130,6 +130,7 @@ else (INTERNAL_HDF5)
endif()
endforeach()
cmessage(STATUS "HDF5 libpath: ${HDF5_BIN_DIR}")
SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
else()
cmessage(STATUS "Found HDF5 cmake config.")
cmessage(STATUS "HDF5_C_STATIC_LIBRARY : ${HDF5_C_STATIC_LIBRARY}")
@ -342,7 +343,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)
@ -356,6 +357,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)