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

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
Show Stats 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) ENDMACRO(CHECK_CHANGE_STATE)
CHECK_CHANGE_STATE(INTERNAL_BOOST Boost_LIBRARIES Boost_INCLUDE_DIRS) 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_GSL GSL_LIBRARY GSL_CBLAS_LIBRARY GSL_INCLUDE)
CHECK_CHANGE_STATE(INTERNAL_HDF5 CHECK_CHANGE_STATE(INTERNAL_HDF5
HDF5_INCLUDE_DIR HDF5_LIBRARIES HDF5_CXX_LIBRARIES HDF5_INCLUDE_DIR HDF5_LIBRARIES HDF5_CXX_LIBRARIES
@ -130,6 +130,7 @@ else (INTERNAL_HDF5)
endif() endif()
endforeach() endforeach()
cmessage(STATUS "HDF5 libpath: ${HDF5_BIN_DIR}") cmessage(STATUS "HDF5 libpath: ${HDF5_BIN_DIR}")
SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
else() else()
cmessage(STATUS "Found HDF5 cmake config.") cmessage(STATUS "Found HDF5 cmake config.")
cmessage(STATUS "HDF5_C_STATIC_LIBRARY : ${HDF5_C_STATIC_LIBRARY}") cmessage(STATUS "HDF5_C_STATIC_LIBRARY : ${HDF5_C_STATIC_LIBRARY}")
@ -342,7 +343,7 @@ IF (INTERNAL_EIGEN)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_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) ELSE (INTERNAL_EIGEN)
if(DEFINED EIGEN_PATH) if(DEFINED EIGEN_PATH)
@ -356,6 +357,9 @@ ELSE (INTERNAL_EIGEN)
if (NOT EIGEN3_FOUND) if (NOT EIGEN3_FOUND)
cmessage(CWARNING "Eigen library not found") cmessage(CWARNING "Eigen library not found")
else() else()
IF(EIGEN3_STATIC_INCLUDE_DIRS)
SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_STATIC_INCLUDE_DIRS})
ENDIF()
cmessage(STATUS "Found EIGEN3 in ${EIGEN3_INCLUDE_DIRS}") cmessage(STATUS "Found EIGEN3 in ${EIGEN3_INCLUDE_DIRS}")
endif() endif()
ENDIF(INTERNAL_EIGEN) ENDIF(INTERNAL_EIGEN)

2
src/CMakeLists.txt
View File

@ -41,7 +41,7 @@ if (HDF5_FOUND)
set_property(TARGET CosmoHDF5 PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}) set_property(TARGET CosmoHDF5 PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
target_include_directories(CosmoHDF5 BEFORE PRIVATE ${HDF5_INCLUDE_DIR}) target_include_directories(CosmoHDF5 BEFORE PRIVATE ${HDF5_INCLUDE_DIR})
else(HDF5_FOUND) else(HDF5_FOUND)
add_library(CosmoHdf5 OBJECT add_library(CosmoHDF5 OBJECT
loadFlash_dummy.cpp loadFlash_dummy.cpp
) )
endif (HDF5_FOUND) endif (HDF5_FOUND)

2
src/hdf5_array.hpp
View File

@ -51,7 +51,7 @@ knowledge of the CeCILL license and that you accept its terms.
#include <H5Cpp.h> #include <H5Cpp.h>
namespace CosmoTool { namespace CosmoTool {
#if (H5_VERS_MAJOR == 1) && (H5_VERS_MINOR <= 8) #if H5_VERSION_GE(1,8,20)
typedef H5::CommonFG H5_CommonFileGroup; typedef H5::CommonFG H5_CommonFileGroup;
#else #else
typedef H5::Group H5_CommonFileGroup; typedef H5::Group H5_CommonFileGroup;