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, master has been updated
via 9dd1d351fe2cb90e3adbe5cb191f6a3727f78979 (commit)
via 7150082aa86223a441575a95e4a50107e22e9a0d (commit)
via c8a866b8c47f25ffd5e63e82bf4e501344bf7740 (commit)
via ae22079808d708d630dacf3bcd368a123e6bcedf (commit)
via 522c92d752753089f4bd50552955883a6f005570 (commit)
via 83784ed18bc2b6edcfb9400c350562356ef554f2 (commit)
via 43dae6459797ccebc53956050ac058a933b60078 (commit)
from 55d752b10855f22642dc69fd99a79af6d085831b (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=9dd1d351fe2cb90e3adbe5cb191f6a3727f78979
commit 9dd1d351fe2cb90e3adbe5cb191f6a3727f78979
Merge: 7150082 ae22079
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 9 10:09:22 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jun 9 10:09:22 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7150082aa86223a441575a95e4a50107e22e9a0d
commit 7150082aa86223a441575a95e4a50107e22e9a0d
Merge: c8a866b 83784ed
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 9 14:08:22 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 9 10:08:26 2017 -0400
Merge topic 'bootstrap-cleanup'
83784ed1 bootstrap: remove leftover empty variable dereference
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !944
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a866b8c47f25ffd5e63e82bf4e501344bf7740
commit c8a866b8c47f25ffd5e63e82bf4e501344bf7740
Merge: 55d752b 522c92d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 9 14:06:58 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 9 10:07:16 2017 -0400
Merge topic 'FindDoxygen-imported-target-once'
522c92d7 FindDoxygen: Create imported targets at most once in a given scope
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !945
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83784ed18bc2b6edcfb9400c350562356ef554f2
commit 83784ed18bc2b6edcfb9400c350562356ef554f2
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Thu Jun 8 21:19:25 2017 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Thu Jun 8 21:19:25 2017 +0200
bootstrap: remove leftover empty variable dereference
This was missed in 9c0d1e7531edbebc7943d5b981353b17631ed632 when the for
loop
that used this as loop variable was removed.
diff --git a/bootstrap b/bootstrap
index 2cf7847..ba2a5f3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,7 +10,7 @@ die() {
cmake_extract_standard_flags()
{
sed -n "s/ *set *( *CMAKE_${2}${3}_EXTENSION_COMPILE_OPTION
*\"\{0,1\}\([^\")]*\).*/\1/p" \
- "${file}" "${cmake_source_dir}/Modules/Compiler/"${1:-*}-${2}.cmake
2>/dev/null | tr ';' ' '
+ "${cmake_source_dir}/Modules/Compiler/"${1:-*}-${2}.cmake 2>/dev/null | tr
';' ' '
}
# Version number extraction function.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindDoxygen.cmake | 40 ++++++++++++++++++++++++----------------
bootstrap | 2 +-
2 files changed, 25 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
