diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2013-09-09 17:41:05 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2013-09-09 17:41:05 (GMT) |
| commit | 03c3fa68ea37af0dff590da724df8f548a9e34a9 (patch) | |
| tree | 6391a6709b3c3b6581123d90147076ec98a8c14b /Source | |
| parent | 1e11708a560f0d06867fb3f2a83149b224ef44ba (diff) | |
| parent | ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 (diff) | |
| download | CMake-03c3fa68ea37af0dff590da724df8f548a9e34a9.zip CMake-03c3fa68ea37af0dff590da724df8f548a9e34a9.tar.gz CMake-03c3fa68ea37af0dff590da724df8f548a9e34a9.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 3003a3a..fcffb29 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 20130909) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 12) +set(CMake_VERSION_TWEAK 0) +set(CMake_VERSION_RC 2) 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. |