summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-10-04 11:48:52 -0400
committerDavid Cole <david.cole@kitware.com>2011-10-04 11:48:52 -0400
commit5971063a5c41a1c899de3700ffce38c8655abe34 (patch)
tree561c9bb75a6df48e123d91b24dd345e72ec7614d
parentfd9890077c2cbeefd8b0ad317b9b0b672df7ce31 (diff)
downloadcmake-2.8.6.tar.gz
CMake 2.8.6v2.8.6
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog.manual29
2 files changed, 30 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8927637cd2..126a006795 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,7 +420,7 @@ SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 6)
SET(CMake_VERSION_TWEAK 0)
-SET(CMake_VERSION_RC 4)
+#SET(CMake_VERSION_RC 4)
# Releases define a tweak level.
IF(DEFINED CMake_VERSION_TWEAK)
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 88583b4598..3199767813 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,32 @@
+Changes in CMake 2.8.6 (since 2.8.6-rc4)
+----------------------------------------
+Alex Neundorf (5):
+ Remove trailing whitespace
+ Minor improvements to the UsePkgConfig.cmake docs
+ Remove trailing whitespace
+ Improve behaviour of --find-package mode with try_run/try_compile
+ Use makefile->IssueMessage() for better error messages
+
+Bill Hoffman (2):
+ Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
+ Also, check for 11.x as an intel fortran version.
+
+Brad King (2):
+ Add Visual Studio 11 generator for x86 and x64 tools
+ Teach our tests about special cases for VS 11
+
+David Cole (1):
+ CTestCustom.cmake: Ignore clang's summary warning
+
+Philip Lowman (1):
+ FindBullet: Also search for _Debug postfixed library names
+
+Raphael Kubo da Costa (1):
+ Fix typo in set_target_properties' documentation.
+
+Rolf Eike Beer (1):
+ Fix typo in UsePkgConfig.cmake
+
Changes in CMake 2.8.6-rc4 (since 2.8.6-rc3)
--------------------------------------------
Alex Neundorf (3):