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 f8955baf557a8653e1a2b8e0667b6689931c287b (commit)
via 9f2728cef3763dff93a43b933a10f32eb73f7c6b (commit)
via 149539d9c2d90da76facbd70c969b82af8e2448a (commit)
via f30b0fec749710e7eec68ddd148215609a5c01f9 (commit)
from c480bac574a2fb8bc93ab35e052720d003cfd808 (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=f8955baf557a8653e1a2b8e0667b6689931c287b
commit f8955baf557a8653e1a2b8e0667b6689931c287b
Merge: c480bac 9f2728c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 23 14:10:39 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 23 14:10:39 2016 -0400
Merge topic 'handle_unsiffixed_hdf5' into next
9f2728ce FindHDF5: When component targets not found fallback to compiler
wrappers
149539d9 FindHDF5: Handle HDF5 builds with non-suffixed components
f30b0fec FindHDF5: correctly add lang to each component target name.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f2728cef3763dff93a43b933a10f32eb73f7c6b
commit 9f2728cef3763dff93a43b933a10f32eb73f7c6b
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu Jun 23 12:31:26 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu Jun 23 12:31:26 2016 -0400
FindHDF5: When component targets not found fallback to compiler wrappers
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 53c0085..7c1581d 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -366,6 +366,12 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
#Older versions of hdf5 don't have a static/shared suffix so
#if we detect that occurrence clear the suffix
if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix})
+ if(NOT TARGET ${HDF5_${_lang}_TARGET})
+ #cant find this component with our without the suffix
+ #so bail out, and let the following locate HDF5
+ set(HDF5_FOUND FALSE)
+ break()
+ endif()
set(_suffix "")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=149539d9c2d90da76facbd70c969b82af8e2448a
commit 149539d9c2d90da76facbd70c969b82af8e2448a
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu Jun 23 10:57:58 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu Jun 23 10:57:58 2016 -0400
FindHDF5: Handle HDF5 builds with non-suffixed components
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index cc05f1c..53c0085 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -362,6 +362,13 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
set(_suffix "-shared")
endif()
foreach(_lang ${HDF5_LANGUAGE_BINDINGS})
+
+ #Older versions of hdf5 don't have a static/shared suffix so
+ #if we detect that occurrence clear the suffix
+ if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix})
+ set(_suffix "")
+ endif()
+
get_target_property(_lang_location
${HDF5_${_lang}_TARGET}${_suffix} LOCATION)
if( _lang_location )
set(HDF5_${_lang}_LIBRARY ${_lang_location} CACHE PATH
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f30b0fec749710e7eec68ddd148215609a5c01f9
commit f30b0fec749710e7eec68ddd148215609a5c01f9
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu Jun 23 10:56:29 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu Jun 23 10:56:29 2016 -0400
FindHDF5: correctly add lang to each component target name.
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index bc0d50b..cc05f1c 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -362,7 +362,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
set(_suffix "-shared")
endif()
foreach(_lang ${HDF5_LANGUAGE_BINDINGS})
- get_target_property(_lang_location
${HDF5_${_component}_TARGET}${_suffix} LOCATION)
+ get_target_property(_lang_location
${HDF5_${_lang}_TARGET}${_suffix} LOCATION)
if( _lang_location )
set(HDF5_${_lang}_LIBRARY ${_lang_location} CACHE PATH
"HDF5 ${_lang} library" )
-----------------------------------------------------------------------
Summary of changes:
Modules/FindHDF5.cmake | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
