[Cmake-commits] CMake branch, next, updated. v3.6.1-1044-gdc1dbed
Chuck Atkins
chuck.atkins at kitware.com
Tue Aug 2 10:42:09 EDT 2016
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 dc1dbedc733126da4ed0fff03cefab71b0692d22 (commit)
via 8eb0b56c2ace0f005cba436268337f509e06033f (commit)
from e6bfb7d0d6a053aeb105a2480687519095b35b70 (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=dc1dbedc733126da4ed0fff03cefab71b0692d22
commit dc1dbedc733126da4ed0fff03cefab71b0692d22
Merge: e6bfb7d 8eb0b56
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Aug 2 10:42:08 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 10:42:08 2016 -0400
Merge topic 'fix-findhdf5-definitions' into next
8eb0b56c FindHDF5: Make sure compile definition vars keep the -D flag
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8eb0b56c2ace0f005cba436268337f509e06033f
commit 8eb0b56c2ace0f005cba436268337f509e06033f
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Aug 2 10:34:51 2016 -0400
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Tue Aug 2 10:34:51 2016 -0400
FindHDF5: Make sure compile definition vars keep the -D flag
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 50e1892..a898386 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -332,7 +332,7 @@ macro( _HDF5_parse_compile_line
set( RE " -D([^ ]*)")
string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" )
foreach( DEF IN LISTS definition_flags )
- string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" )
+ string( STRIP "${DEF}" DEF )
list( APPEND ${definitions} ${DEF} )
endforeach()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindHDF5.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list