From 48a9e0d73212657c6f5300cbfffa5b85c4e5b375 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 19 May 2020 15:20:41 -0400 Subject: [PATCH] consolidate setting CMake policy CMP0074 into main cmake file --- cmake/CMakeLists.txt | 5 +++++ cmake/Modules/FindTBB_MALLOC.cmake | 4 ---- cmake/Modules/Packages/USER-H5MD.cmake | 5 ----- cmake/Modules/Packages/USER-NETCDF.cmake | 5 ----- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index a7f92c0672..8d7003b467 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -3,6 +3,11 @@ # This file is part of LAMMPS # Created by Christoph Junghans and Richard Berger cmake_minimum_required(VERSION 3.10) +# set policy to silence warnings about ignoring _ROOT but use it +if(POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() +######################################## project(lammps CXX) set(SOVERSION 0) diff --git a/cmake/Modules/FindTBB_MALLOC.cmake b/cmake/Modules/FindTBB_MALLOC.cmake index f837932ba8..d34b946ad3 100644 --- a/cmake/Modules/FindTBB_MALLOC.cmake +++ b/cmake/Modules/FindTBB_MALLOC.cmake @@ -6,10 +6,6 @@ # TBB_MALLOC_FOUND - True if tbb found. # -# silence warning about ignoring _ROOT and use it. -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() ######################################################## # TBB Malloc diff --git a/cmake/Modules/Packages/USER-H5MD.cmake b/cmake/Modules/Packages/USER-H5MD.cmake index 274c0914e2..4fcae93027 100644 --- a/cmake/Modules/Packages/USER-H5MD.cmake +++ b/cmake/Modules/Packages/USER-H5MD.cmake @@ -1,10 +1,5 @@ enable_language(C) -# silence warning about ignoring _ROOT and use it. -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - find_package(HDF5 REQUIRED) target_link_libraries(h5md PRIVATE ${HDF5_LIBRARIES}) target_include_directories(h5md PUBLIC ${HDF5_INCLUDE_DIRS}) diff --git a/cmake/Modules/Packages/USER-NETCDF.cmake b/cmake/Modules/Packages/USER-NETCDF.cmake index 36c5a06385..d63e9773c3 100644 --- a/cmake/Modules/Packages/USER-NETCDF.cmake +++ b/cmake/Modules/Packages/USER-NETCDF.cmake @@ -1,11 +1,6 @@ # 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" -# silence warning about ignoring _ROOT and use it. -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - # may use NetCDF or PNetCDF with MPI, but must have NetCDF without if(NOT BUILD_MPI) find_package(NetCDF REQUIRED)