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

Add support for setup.py in the rest of cmake files. Fix for HDF5.

Browse source
This commit is contained in:
Guilhem Lavaux 2019-08-15 13:12:57 +03:00
parent 4522b676a9
commit 3626ebf5ce
4 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/CMakeLists.txt
View file

@ -99,19 +99,21 @@ else (BUILD_SHARED_LIBS)
set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON)
endif (BUILD_SHARED_LIBS)
install(TARGETS CosmoTool
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
if (BUILD_SHARED_LIBS)
install(TARGETS CosmoTool_static
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif (BUILD_SHARED_LIBS)
install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY ${OMPTL_BUILD_DIR}
DESTINATION include/CosmoTool)
install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.tcc")
IF(NOT COSMOTOOL_PYTHON_PACKAGING)
install(TARGETS CosmoTool
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
if (BUILD_SHARED_LIBS)
install(TARGETS CosmoTool_static
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif (BUILD_SHARED_LIBS)
install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY ${OMPTL_BUILD_DIR}
DESTINATION include/CosmoTool)
install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.tcc")
ENDIF()

4
src/hdf5_array.hpp
View file

@ -55,10 +55,10 @@ namespace CosmoTool {
#if H5_VERSION_GE(1,10,1)
typedef H5::H5Location H5_CommonFileGroup;
#else
typedef H5::CommonFG H5_CommonFileGroup;
typedef H5::Group H5_CommonFileGroup;
#endif
#else
typedef H5::Group H5_CommonFileGroup;
typedef H5::CommonFG H5_CommonFileGroup;
#endif
//!_______________________________________________________________________________________