[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-234-g829748c
Brad King
brad.king at kitware.com
Fri Feb 17 09:32:55 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 829748c7d25f49059e79031fc747ccf75fe11242 (commit)
via 96d6139386e22f672f14071eae3911fd7200f079 (commit)
from 2ba45d5adf671b82ed11aa994b920e988d0500a9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=829748c7d25f49059e79031fc747ccf75fe11242
commit 829748c7d25f49059e79031fc747ccf75fe11242
Merge: 2ba45d5 96d6139
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 17 09:32:53 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 17 09:32:53 2017 -0500
Merge topic 'FindHDF5-fix-header-langs' into next
96d61393 FindHDF5: Fix search for language-specific header file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96d6139386e22f672f14071eae3911fd7200f079
commit 96d6139386e22f672f14071eae3911fd7200f079
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 17 09:21:02 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 17 09:25:46 2017 -0500
FindHDF5: Fix search for language-specific header file
Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of
compiler wrappers, 2016-04-04) converted code of the form
if(${LANGUAGE} MATCHES ...)
to
if(LANGUAGE MATCHES ...)
However, `LANGUAGE` is a foreach() loop variable and not a normal
variable so auto-dereference does not occur. Restore the explicit `${}`
syntax and use the new name of the loop variable that has changed since
then too.
Fixes: #16651
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index fb97d68..65a825d 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -666,9 +666,9 @@ if( NOT HDF5_FOUND )
foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS)
# find the HDF5 include directories
- if(LANGUAGE STREQUAL "Fortran")
+ if("${__lang}" STREQUAL "Fortran")
set(HDF5_INCLUDE_FILENAME hdf5.mod)
- elseif(LANGUAGE STREQUAL "CXX")
+ elseif("${__lang}" STREQUAL "CXX")
set(HDF5_INCLUDE_FILENAME H5Cpp.h)
else()
set(HDF5_INCLUDE_FILENAME hdf5.h)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindHDF5.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list