Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ jobs:
run: |
docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
docker exec build /bin/bash -c "HDF5_STATIC=ON; [ \"${H5CPP_SHARED}\" = \"True\" ] && HDF5_STATIC=OFF; git config --global --add safe.directory /home/p00user/src && mkdir ../build && cd ../build &&
cmake ../src -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DH5CPP_CATCH2_V2=TRUE -DHDF5_USE_STATIC_LIBRARIES=${HDF5_STATIC} -DH5CPP_BUILD_SHARED=${H5CPP_SHARED} -DH5CPP_WITH_BOOST=${H5CPP_WITH_BOOST} -DH5CPP_WITH_MPI=${H5CPP_WITH_MPI}"
cmake ../src -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DH5CPP_OLD_CMAKE=ON -DH5CPP_CATCH2_V2=TRUE -DHDF5_USE_STATIC_LIBRARIES=${HDF5_STATIC} -DH5CPP_BUILD_SHARED=${H5CPP_SHARED} -DH5CPP_WITH_BOOST=${H5CPP_WITH_BOOST} -DH5CPP_WITH_MPI=${H5CPP_WITH_MPI}"
- name: Build all
run: docker exec build /bin/bash -c "cd ../build && cmake --build . -- -j 2"
- name: Build html
Expand Down
16 changes: 12 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ project(h5cpp
VERSION 0.7
)

option(H5CPP_OLD_CMAKE "enable support for old cmake versions" OFF)

#=============================================================================
# Augment CMake with our custom scripts
#=============================================================================
set(EXTRA_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
list(APPEND CMAKE_MODULE_PATH ${EXTRA_MODULES_DIR})

if (H5CPP_OLD_CMAKE)
set(EXTRA_OLDMODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake/old)
list(APPEND CMAKE_MODULE_PATH ${EXTRA_OLDMODULES_DIR})
endif()

if (NOT DEFINED BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON)
endif()
Expand Down Expand Up @@ -171,10 +177,12 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}
COMPONENT development)

install(FILES
cmake/FindHDF5.cmake
DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}/hdf5
COMPONENT development)
if (H5CPP_OLD_CMAKE)
install(FILES
cmake/old/FindHDF5.cmake
DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}/hdf5
COMPONENT development)
endif()

#
# uninstall target
Expand Down
File renamed without changes.
Loading