diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2013-08-30 13:27:35 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2013-08-30 13:27:35 (GMT) |
| commit | 90b51230d93eef07e16000c6bdfe2eb0cef65a82 (patch) | |
| tree | 3e0a6fdb75fa1130f17956370a5dd29f2228b5d5 /Source | |
| parent | 452882ebeb032b25a08d35f2b2df3a785093ca6c (diff) | |
| parent | 330db97e64e9e370ecf636aae2275044286537bf (diff) | |
| download | CMake-90b51230d93eef07e16000c6bdfe2eb0cef65a82.zip CMake-90b51230d93eef07e16000c6bdfe2eb0cef65a82.tar.gz CMake-90b51230d93eef07e16000c6bdfe2eb0cef65a82.tar.bz2 | |
Merge branch 'release'
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 6 | ||||
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 92c9618..1fbc6f7 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,6 +1,6 @@ # CMake version number components. set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) -set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130830) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 12) +set(CMake_VERSION_TWEAK 0) +set(CMake_VERSION_RC 1) diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index c97d4ff..c8b4a79 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -162,7 +162,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) if (require2_8_12) { - this->GenerateRequiredCMakeVersion(os, "2.8.11.20130626"); + this->GenerateRequiredCMakeVersion(os, "2.8.12"); } // Now load per-configuration properties for them. |