ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update test for whether to set CMake policy CMP0074 is needed.

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-05-19 11:53:47 -04:00
parent ffaa77af6b
commit 16db223d03
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/FindTBB_MALLOC.cmake
View File

@ -6,7 +6,8 @@
# TBB_MALLOC_FOUND - True if tbb found. # TBB_MALLOC_FOUND - True if tbb found.
# #
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) # silence warning about ignoring <PackageName>_ROOT and use it.
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
endif() endif()
######################################################## ########################################################

4
cmake/Modules/Packages/USER-H5MD.cmake
View File

@ -1,8 +1,10 @@
enable_language(C) enable_language(C)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) # silence warning about ignoring <PackageName>_ROOT and use it.
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
endif() endif()
find_package(HDF5 REQUIRED) find_package(HDF5 REQUIRED)
target_link_libraries(h5md PRIVATE ${HDF5_LIBRARIES}) target_link_libraries(h5md PRIVATE ${HDF5_LIBRARIES})
target_include_directories(h5md PUBLIC ${HDF5_INCLUDE_DIRS}) target_include_directories(h5md PUBLIC ${HDF5_INCLUDE_DIRS})

6
cmake/Modules/Packages/USER-NETCDF.cmake
View File

@ -1,8 +1,12 @@
# USER-NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary. # USER-NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary.
# NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio" # NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
# silence warning about ignoring <PackageName>_ROOT and use it.
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
endif() endif()
# may use NetCDF or PNetCDF with MPI, but must have NetCDF without
if(NOT BUILD_MPI) if(NOT BUILD_MPI)
find_package(NetCDF REQUIRED) find_package(NetCDF REQUIRED)
else() else()