Skip to content

Commit 8c37c86

Browse files
committed
More Old CMake Cleanup
1 parent 6ca8395 commit 8c37c86

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

Docs/sphinx_documentation/source/BuildingAMReX_Chapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Fortran compiler that supports the Fortran 2003 standard, and a C
2323
compiler that supports the C99 standard. Prerequisites for building
2424
with GNU Make include Python (>= 2.7, including 3) and standard tools
2525
available in any Unix-like environments (e.g., Perl and sed). For
26-
building with CMake, the minimal requirement is version 3.18.
26+
building with CMake, the minimal requirement is version 3.25.
2727

2828
Please note that we fully support AMReX for Linux systems in general and on the
2929
DOE supercomputers (e.g. Cori, Summit) in particular. Many of our users do build

Tools/CMake/AMReXThirdPartyLibraries.cmake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ if (AMReX_HDF5)
5959
endif ()
6060

6161
foreach(D IN LISTS AMReX_SPACEDIM)
62-
if (TARGET hdf5::hdf5) # CMake >= 3.19
63-
target_link_libraries(amrex_${D}d PUBLIC hdf5::hdf5)
64-
else () # CMake < 3.19 -- Remove when minimum cmake version is bumped up
65-
target_include_directories(amrex_${D}d PUBLIC ${HDF5_INCLUDE_DIRS})
66-
target_compile_definitions(amrex_${D}d PUBLIC ${HDF5_DEFINITIONS})
67-
target_link_libraries(amrex_${D}d PUBLIC ${HDF5_LIBRARIES})
68-
endif ()
62+
target_link_libraries(amrex_${D}d PUBLIC hdf5::hdf5)
6963
endforeach()
7064

7165
endif ()
@@ -81,12 +75,7 @@ if (AMReX_HDF5_ZFP)
8175
endif ()
8276

8377
foreach(D IN LISTS AMReX_SPACEDIM)
84-
if (TARGET h5z_zfp::h5z_zfp) # CMake >= 3.19
85-
target_link_libraries(amrex_${D}d PUBLIC h5z_zfp::h5z_zfp)
86-
else () # CMake < 3.19 -- Remove when minimum cmake version is bumped up
87-
target_include_directories(amrex_${D}d PUBLIC ${H5Z_ZFP_INCLUDE_DIR})
88-
target_link_libraries(amrex_${D}d PUBLIC ${H5Z_ZFP_LIBRARY})
89-
endif ()
78+
target_link_libraries(amrex_${D}d PUBLIC h5z_zfp::h5z_zfp)
9079
endforeach()
9180
endif ()
9281

0 commit comments

Comments
 (0)