Merge pull request #2094 from akohlmey/collected-small-changes

Collected small changes and bug fixes for the next patch release

cmake/Modules/FindTBB_MALLOC.cmake

@@ -6,7 +6,6 @@
 #  TBB_MALLOC_FOUND        - True if tbb found.
 #
 
-
 ########################################################
 # TBB Malloc
 

cmake/Modules/Packages/USER-H5MD.cmake

@@ -1,8 +1,5 @@
 enable_language(C)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
-  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})

cmake/Modules/Packages/USER-NETCDF.cmake

@@ -1,8 +1,7 @@
 # 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"
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
-  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)
 else()