File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -295,7 +295,7 @@ jobs:
295295 run : |
296296 docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
297297 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 &&
298- 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}"
298+ 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}"
299299 - name : Build all
300300 run : docker exec build /bin/bash -c "cd ../build && cmake --build . -- -j 2"
301301 - name : Build html
Original file line number Diff line number Diff line change @@ -6,13 +6,19 @@ project(h5cpp
66 VERSION 0.7
77 )
88
9+ option (H5CPP_OLD_CMAKE "enable support for old cmake versions" OFF )
910
1011#=============================================================================
1112# Augment CMake with our custom scripts
1213#=============================================================================
1314set (EXTRA_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR} /cmake)
1415list (APPEND CMAKE_MODULE_PATH ${EXTRA_MODULES_DIR} )
1516
17+ if (H5CPP_OLD_CMAKE)
18+ set (EXTRA_OLDMODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR} /cmake/old)
19+ list (APPEND CMAKE_MODULE_PATH ${EXTRA_OLDMODULES_DIR} )
20+ endif ()
21+
1622if (NOT DEFINED BUILD_SHARED_LIBS )
1723 set (BUILD_SHARED_LIBS ON )
1824endif ()
@@ -171,10 +177,12 @@ install(FILES
171177 DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}
172178 COMPONENT development)
173179
174- install (FILES
175- cmake/FindHDF5.cmake
176- DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} /hdf5
177- COMPONENT development)
180+ if (H5CPP_OLD_CMAKE)
181+ install (FILES
182+ cmake/old/FindHDF5.cmake
183+ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} /hdf5
184+ COMPONENT development)
185+ endif ()
178186
179187#
180188# uninstall target
File renamed without changes.
You can’t perform that action at this time.
0 commit comments