[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1049-gc70fd06
Brad King
brad.king at kitware.com
Mon Nov 26 10:28:48 EST 2012
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 c70fd06c17f79ffb599bd0769f21492f5169c124 (commit)
via 242e652e61b7e9d0541d8eb85ac8e7ddbef2a0b0 (commit)
via b30d1a261ce2ca325358df61151cedca048a6c1c (commit)
via 84740c744863314effa7bf1ad32eeb2e9ae79036 (commit)
via c8c17454958ea890b9ddb179ef2bca273d30f929 (commit)
via 4d078ab46074f305ccbcca0359f8b7d0636bf1f3 (commit)
from c0f69b25058ad790b78fe2f4e6041cf6c1dc6046 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c70fd06c17f79ffb599bd0769f21492f5169c124
commit c70fd06c17f79ffb599bd0769f21492f5169c124
Merge: c0f69b2 242e652
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 10:28:44 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 10:28:44 2012 -0500
Merge topic 'test-release' into next
242e652 Merge branch 'release' into test-release
b30d1a2 CMake 2.8.10.2
84740c7 Merge branch 'fix-FindGettext-result' into release
c8c1745 Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into release
4d078ab Merge branch 'FixAutomocRegression3' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=242e652e61b7e9d0541d8eb85ac8e7ddbef2a0b0
commit 242e652e61b7e9d0541d8eb85ac8e7ddbef2a0b0
Merge: e574852 b30d1a2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 10:26:34 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 10:26:49 2012 -0500
Merge branch 'release' into test-release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b30d1a261ce2ca325358df61151cedca048a6c1c
commit b30d1a261ce2ca325358df61151cedca048a6c1c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 10:25:13 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 10:25:13 2012 -0500
CMake 2.8.10.2
diff --git a/ChangeLog.manual b/ChangeLog.manual
index aa55348..7f1eb0d 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,14 @@
+Changes in CMake 2.8.10.2 (since 2.8.10.1)
+----------------------------------------------
+Alex Neundorf (1):
+ Automoc: fix regression #13667, broken build in phonon
+
+Brad King (1):
+ Initialize IMPORTED GLOBAL targets on reconfigure (#13702)
+
+Rolf Eike Beer (1):
+ FindGettext: fix overwriting result with empty variable (#13691)
+
Changes in CMake 2.8.10.1 (since 2.8.10)
----------------------------------------------
Brad King (5):
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 29ac436..c59c618 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 10)
-set(CMake_VERSION_TWEAK 1)
+set(CMake_VERSION_TWEAK 2)
#set(CMake_VERSION_RC 3)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84740c744863314effa7bf1ad32eeb2e9ae79036
commit 84740c744863314effa7bf1ad32eeb2e9ae79036
Merge: c8c1745 a7be253
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 10:22:12 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 10:22:12 2012 -0500
Merge branch 'fix-FindGettext-result' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c17454958ea890b9ddb179ef2bca273d30f929
commit c8c17454958ea890b9ddb179ef2bca273d30f929
Merge: 4d078ab 5ff7587
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 10:22:05 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 10:22:05 2012 -0500
Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d078ab46074f305ccbcca0359f8b7d0636bf1f3
commit 4d078ab46074f305ccbcca0359f8b7d0636bf1f3
Merge: 902ab6b d253657
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 09:02:25 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 09:02:25 2012 -0500
Merge branch 'FixAutomocRegression3' into release
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.manual | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list