[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7084-g53c2032

Brad King brad.king at kitware.com
Mon Jan 13 13:48:40 EST 2014 

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  53c2032fc545f4c267615b761c4e007a34734fb3 (commit)
       via  a82c1441dff4e064c6bf3eaa77a99f1548b6cdb5 (commit)
       via  a921557a6712dc94578c4c068cab55b32d1e3ed3 (commit)
       via  af3ead2cb4e2af47b185bc8be7f8aefd183a1345 (commit)
       via  6d004976deeac00eb8ab3b26f407934110224352 (commit)
       via  67fd61b0615221b76437a6f6fe07fa51876c45b3 (commit)
       via  5e3458830e49e432d31b0aad8a86e35be640afdc (commit)
       via  1ab31dc2ebb608b653760a06e526139e832190f8 (commit)
       via  3401c72c44a099f226c2d790e3bdb6859691416d (commit)
      from  ab91f1dff7f56fa9f50988396862769537aff8d7 (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=53c2032fc545f4c267615b761c4e007a34734fb3
commit 53c2032fc545f4c267615b761c4e007a34734fb3
Merge: ab91f1d a82c144
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 13 13:48:39 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 13 13:48:39 2014 -0500

    Merge topic 'test-release' into next
    
    a82c1441 Merge branch 'release' into test-release
    a921557a CMake 2.8.12.2
    af3ead2c Merge branch 'ninja_fix_rerun' into release
    6d004976 Merge branch 'vs10-include-backslashes' into release
    67fd61b0 Merge branch 'xcode-storyboard-file-type-2.8.12' into release
    5e345883 Merge branch 'fix-compile-OBJECT_DIR' into release
    1ab31dc2 Merge branch 'xcode-5.1' into release
    3401c72c Merge branch 'vs9-map-Fd' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a82c1441dff4e064c6bf3eaa77a99f1548b6cdb5
commit a82c1441dff4e064c6bf3eaa77a99f1548b6cdb5
Merge: 071005a a921557
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 13 13:48:34 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 13 13:48:34 2014 -0500

    Merge branch 'release' into test-release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a921557a6712dc94578c4c068cab55b32d1e3ed3
commit a921557a6712dc94578c4c068cab55b32d1e3ed3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 13 13:05:15 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 13 13:05:15 2014 -0500

    CMake 2.8.12.2

diff --git a/ChangeLog.manual b/ChangeLog.manual
index 5d2dc8b..3371f26 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,22 @@
+Changes in CMake 2.8.12.2 (since 2.8.12.1)
+------------------------------------------
+Brad King (3):
+      VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
+      Replace <OBJECT_DIR> rule placeholder consistently (#14667)
+      VS: Convert include path to backslashes for VS >= 10
+
+Robert Maynard (1):
+      Ninja: Avoid re-running CMake on next build after regeneration
+
+Rolf Eike Beer (1):
+      FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
+
+Ruslan Baratov (1):
+      Xcode: Fix storyboard view
+
+Ted Kremenek (1):
+      CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
+
 Changes in CMake 2.8.12.1 (since 2.8.12)
 ----------------------------------------
 Brad King (9):
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5027370..fd315ce 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 12)
-set(CMake_VERSION_TWEAK 1)
+set(CMake_VERSION_TWEAK 2)
 #set(CMake_VERSION_RC 0)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af3ead2cb4e2af47b185bc8be7f8aefd183a1345
commit af3ead2cb4e2af47b185bc8be7f8aefd183a1345
Merge: 6d00497 6fac24d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 13 10:15:20 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 13 10:15:20 2014 -0500

    Merge branch 'ninja_fix_rerun' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d004976deeac00eb8ab3b26f407934110224352
commit 6d004976deeac00eb8ab3b26f407934110224352
Merge: 67fd61b c131107
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 9 14:06:08 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 9 14:06:08 2014 -0500

    Merge branch 'vs10-include-backslashes' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67fd61b0615221b76437a6f6fe07fa51876c45b3
commit 67fd61b0615221b76437a6f6fe07fa51876c45b3
Merge: 5e34588 93fc5a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 9 14:06:05 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 9 14:06:05 2014 -0500

    Merge branch 'xcode-storyboard-file-type-2.8.12' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e3458830e49e432d31b0aad8a86e35be640afdc
commit 5e3458830e49e432d31b0aad8a86e35be640afdc
Merge: 1ab31dc 03f3b4e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 6 09:46:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 6 09:46:55 2014 -0500

    Merge branch 'fix-compile-OBJECT_DIR' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ab31dc2ebb608b653760a06e526139e832190f8
commit 1ab31dc2ebb608b653760a06e526139e832190f8
Merge: 3401c72 65ee85d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 6 09:46:48 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 6 09:46:48 2014 -0500

    Merge branch 'xcode-5.1' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3401c72c44a099f226c2d790e3bdb6859691416d
commit 3401c72c44a099f226c2d790e3bdb6859691416d
Merge: ebf70b0 bf1db49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 6 09:46:42 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 6 09:46:42 2014 -0500

    Merge branch 'vs9-map-Fd' into release


-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.manual |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list