summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-13 15:04:06 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-13 15:04:06 -0500
commit8206e8b431241eae44ec000971fab1f49ea070fe (patch)
treefe198358cf82e59f9ea38a868cd0ac90dec1e0e4
parent0304e545289bb32a43a7c8973d604dad860f360b (diff)
parent6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b (diff)
downloadcmake-8206e8b431241eae44ec000971fab1f49ea070fe.tar.gz
Merge topic 'doc-3.2-relnotes-fixup'
6d19ef9b Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
-rw-r--r--Help/release/3.2.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Help/release/3.2.rst b/Help/release/3.2.rst
index ddc3d86652..843d65d2fd 100644
--- a/Help/release/3.2.rst
+++ b/Help/release/3.2.rst
@@ -131,12 +131,6 @@ Modules
* The :module:`FindMPI` module learned to find MS-MPI on Windows.
-* The :module:`FindOpenGL` module no longer explicitly searches
- for any dependency on X11 libraries with the :module:`FindX11`
- module. Such dependencies should not need to be explicit.
- Applications using X11 APIs themselves should find and link
- to X11 libraries explicitly.
-
* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
@@ -231,6 +225,12 @@ Deprecated and Removed Features
compatible. If files were in a different encoding, including
Latin 1, they will need to be converted.
+* The :module:`FindOpenGL` module no longer explicitly searches
+ for any dependency on X11 libraries with the :module:`FindX11`
+ module. Such dependencies should not need to be explicit.
+ Applications using X11 APIs themselves should find and link
+ to X11 libraries explicitly.
+
* The implementation of CMake now relies on some C++ compiler features which
are not supported by some older compilers. As a result, those old compilers
can no longer be used to build CMake itself. CMake continues to be able to