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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -20,6 +20,7 @@ option(INTERNAL_BOOST "Build internal version of BOOST" OFF)
option(USE_GIT_VERSION "Use GIT version to pad version number" OFF) option(USE_GIT_VERSION "Use GIT version to pad version number" OFF)
option(YORICK_SUPPORT "Add for pleasant yorick support" ON) option(YORICK_SUPPORT "Add for pleasant yorick support" ON)
option(BUILD_PYTHON "Build the python modules" ON) option(BUILD_PYTHON "Build the python modules" ON)
option(COSMOTOOL_PYTHON_PACKAGING "Flag set to on if we only want the python package to be installed" OFF)
IF(USE_GIT_VERSION) IF(USE_GIT_VERSION)
get_git_head_revision(HEAD GIT_VER) get_git_head_revision(HEAD GIT_VER)
SET(EXTRA_VERSION "-${GIT_VER}") SET(EXTRA_VERSION "-${GIT_VER}")

10
sample/CMakeLists.txt
View File

@ -92,10 +92,12 @@ if (Boost_FOUND)
add_executable(simpleDistanceFilter simpleDistanceFilter.cpp) add_executable(simpleDistanceFilter simpleDistanceFilter.cpp)
target_link_libraries(simpleDistanceFilter ${tolink}) target_link_libraries(simpleDistanceFilter ${tolink})
install(TARGETS simple3DFilter simpleDistanceFilter if (NOT COSMOTOOL_PYTHON_PACKAGING)
RUNTIME DESTINATION bin install(TARGETS simple3DFilter simpleDistanceFilter
LIBRARY DESTINATION lib RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib) LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
add_executable(gadgetToArray gadgetToArray.cpp) add_executable(gadgetToArray gadgetToArray.cpp)
target_link_libraries(gadgetToArray ${tolink}) target_link_libraries(gadgetToArray ${tolink})

34
src/CMakeLists.txt
View File

@ -99,19 +99,21 @@ else (BUILD_SHARED_LIBS)
set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON)
endif (BUILD_SHARED_LIBS) endif (BUILD_SHARED_LIBS)
install(TARGETS CosmoTool IF(NOT COSMOTOOL_PYTHON_PACKAGING)
LIBRARY DESTINATION lib install(TARGETS CosmoTool
ARCHIVE DESTINATION lib) LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
if (BUILD_SHARED_LIBS)
install(TARGETS CosmoTool_static if (BUILD_SHARED_LIBS)
LIBRARY DESTINATION lib install(TARGETS CosmoTool_static
ARCHIVE DESTINATION lib) LIBRARY DESTINATION lib
endif (BUILD_SHARED_LIBS) ARCHIVE DESTINATION lib)
endif (BUILD_SHARED_LIBS)
install(DIRECTORY . DESTINATION include/CosmoTool
FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY . DESTINATION include/CosmoTool
install(DIRECTORY ${OMPTL_BUILD_DIR} FILES_MATCHING PATTERN "*.hpp")
DESTINATION include/CosmoTool) install(DIRECTORY ${OMPTL_BUILD_DIR}
install(DIRECTORY . DESTINATION include/CosmoTool DESTINATION include/CosmoTool)
FILES_MATCHING PATTERN "*.tcc") 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) #if H5_VERSION_GE(1,10,1)
typedef H5::H5Location H5_CommonFileGroup; typedef H5::H5Location H5_CommonFileGroup;
#else #else
typedef H5::CommonFG H5_CommonFileGroup; typedef H5::Group H5_CommonFileGroup;
#endif #endif
#else #else
typedef H5::Group H5_CommonFileGroup; typedef H5::CommonFG H5_CommonFileGroup;
#endif #endif
//!_______________________________________________________________________________________ //!_______________________________________________________________________________________