[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1479-g28dcccf

Brad King brad.king at kitware.com
Wed Feb 19 09:55:46 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, master has been updated
       via  28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7 (commit)
       via  38082dea2b9c68a934cb59b9e2f02d8b6a35de38 (commit)
       via  7cbab178718de26575fe98144e7e388b2f6735a6 (commit)
       via  4bb80396e09882dcb8bc0feb10de88351eb55e68 (commit)
       via  f8ccb6d0387a8d116584d1ea8c43cac56679ec71 (commit)
       via  db68dd2454372e676cc482f0e722576feb5e28ae (commit)
       via  d30e4fa703f8c72559e0f8e6ff92b0b957c95d39 (commit)
      from  a7c956b86736ea82ade88bea6414cd6a8c84e307 (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=28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7
commit 28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 19 09:30:37 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 19 09:30:37 2014 -0500

    Begin post-3.0 development

diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
new file mode 100644
index 0000000..e4cc01e
--- /dev/null
+++ b/Help/release/dev/0-sample-topic.rst
@@ -0,0 +1,7 @@
+0-sample-topic
+--------------
+
+* This is a sample release note for the change in a topic.
+  Developers should add similar notes for each topic branch
+  making a noteworthy change.  Each document should be named
+  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 752c568..15ce065 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,6 +5,8 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
+.. include:: dev.txt
+
 Releases
 ========
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5ce43f5..abe9a66 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 0)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20140219)
+#set(CMake_VERSION_RC 1)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38082dea2b9c68a934cb59b9e2f02d8b6a35de38
commit 38082dea2b9c68a934cb59b9e2f02d8b6a35de38
Merge: a7c956b 7cbab17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 19 09:30:28 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 19 09:30:28 2014 -0500

    Merge branch 'release'


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

Summary of changes:
 CMakeCPackOptions.cmake.in              |   10 ++++------
 Help/release/{3.0.rst => 3.0.0.rst}     |   14 +++++++++++---
 Help/release/dev/Boost_NAMESPACE.rst    |    5 -----
 Help/release/index.rst                  |    2 +-
 Help/variable/CMAKE_TWEAK_VERSION.rst   |   10 ++++++++--
 Help/variable/CMAKE_VERSION.rst         |   19 ++++++++++++-------
 Modules/FindGTK2.cmake                  |    2 +-
 Source/CMakeInstallDestinations.cmake   |    8 ++++----
 Source/CMakeVersion.bash                |    2 +-
 Source/CMakeVersion.cmake               |    7 +++----
 Source/CMakeVersionCompute.cmake        |    7 ++-----
 Source/cmExportBuildFileGenerator.cxx   |    2 +-
 Source/cmExportFileGenerator.h          |   13 ++++++-------
 Source/cmExportInstallFileGenerator.cxx |    2 +-
 Source/cmVersion.cxx                    |    2 +-
 Source/cmVersionConfig.h.in             |    1 -
 Source/cmVersionMacros.h                |    4 ++--
 bootstrap                               |    5 -----
 18 files changed, 58 insertions(+), 57 deletions(-)
 rename Help/release/{3.0.rst => 3.0.0.rst} (97%)
 delete mode 100644 Help/release/dev/Boost_NAMESPACE.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list