Skip to content

Commit

Permalink
HDF5: Update the CMake FindHDF5 module to upstream CMake
Browse files Browse the repository at this point in the history
The updated FindHDF5 module addresses various issues related to compiler
wrappers (i.e. Cray).
  • Loading branch information
Chuck Atkins committed Jun 29, 2016
1 parent ceadc32 commit 351d0a6
Show file tree
Hide file tree
Showing 8 changed files with 1,281 additions and 11 deletions.
6 changes: 5 additions & 1 deletion CMake/FindHDF5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
# (BUG #0014363).

# include the default FindHDF5.cmake.
include(${CMAKE_ROOT}/Modules/FindHDF5.cmake)
if(CMAKE_VERSION VERSION_LESS 3.6.0)
include(${CMAKE_CURRENT_LIST_DIR}/NewCMake/FindHDF5.cmake)
else()
include(${CMAKE_ROOT}/Modules/FindHDF5.cmake)
endif()

if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL))
include(vtkMPI)
Expand Down
21 changes: 21 additions & 0 deletions CMake/NewCMake/CMakeParseArguments.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#.rst:
# CMakeParseArguments
# -------------------
#
# This module once implemented the :command:`cmake_parse_arguments` command
# that is now implemented natively by CMake. It is now an empty placeholder
# for compatibility with projects that include it to get the command from
# CMake 3.4 and lower.

#=============================================================================
# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)

0 comments on commit 351d0a6

Please sign in to comment.