Просмотр исходного кода

Merge branch 'doc-FindITK-FindVTK-relnotes' into release

Brad King 11 лет назад
Родитель
Сommit
addff66d33
1 измененных файлов с 11 добавлено и 4 удалено
  1. 11 4
      Help/release/3.1.0.rst

+ 11 - 4
Help/release/3.1.0.rst

@@ -238,10 +238,6 @@ Modules
 * The :module:`FindPkgConfig` module learned to use the ``PKG_CONFIG``
 * The :module:`FindPkgConfig` module learned to use the ``PKG_CONFIG``
   environment variable value as the ``pkg-config`` executable, if set.
   environment variable value as the ``pkg-config`` executable, if set.
 
 
-* The :module:`FindVTK` module dropped support for finding VTK 4.0.
-  It is now a thin-wrapper around ``find_package(VTK ... NO_MODULE)``.
-  This produces much clearer error messages when VTK is not found.
-
 * The :module:`FindZLIB` module now provides imported targets.
 * The :module:`FindZLIB` module now provides imported targets.
 
 
 * The :module:`GenerateExportHeader` module ``generate_export_header``
 * The :module:`GenerateExportHeader` module ``generate_export_header``
@@ -356,6 +352,17 @@ Deprecated and Removed Features
   it is deprecated and should not longer be used.  Use the
   it is deprecated and should not longer be used.  Use the
   :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable instead.
   :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable instead.
 
 
+* The :module:`FindITK` module has been removed altogether.
+  It was a thin-wrapper around ``find_package(ITK ... NO_MODULE)``.
+  This produces much clearer error messages when ITK is not found.
+
+* The :module:`FindVTK` module has been removed altogether.
+  It was a thin-wrapper around ``find_package(VTK ... NO_MODULE)``.
+  This produces much clearer error messages when VTK is not found.
+
+  The module also provided compatibility support for finding VTK 4.0.
+  This capability has been dropped.
+
 Other Changes
 Other Changes
 =============
 =============