diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-05 18:32:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-05 18:32:50 (GMT) |
| commit | e2c431dc642225aa163fc229a0a850844d6bcff2 (patch) | |
| tree | b830867f161f8ddba9a1d8c440a9df757c020681 /Help | |
| parent | eff4081bfbc7285ceeb5d6ec32a4f8682066cef6 (diff) | |
| parent | 27141eede739fb4376a6fe2cec1b1171841bf7fb (diff) | |
| download | CMake-e2c431dc642225aa163fc229a0a850844d6bcff2.zip CMake-e2c431dc642225aa163fc229a0a850844d6bcff2.tar.gz CMake-e2c431dc642225aa163fc229a0a850844d6bcff2.tar.bz2 | |
Merge branch 'xerces-rename' into release
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 2 | ||||
| -rw-r--r-- | Help/module/FindXerces.rst | 1 | ||||
| -rw-r--r-- | Help/module/FindXercesC.rst | 1 | ||||
| -rw-r--r-- | Help/release/3.1.0.rst | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index f5a35b3..201c95f 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -208,7 +208,7 @@ All Modules /module/FindWish /module/FindwxWidgets /module/FindwxWindows - /module/FindXerces + /module/FindXercesC /module/FindX11 /module/FindXMLRPC /module/FindZLIB diff --git a/Help/module/FindXerces.rst b/Help/module/FindXerces.rst deleted file mode 100644 index 166d8dd..0000000 --- a/Help/module/FindXerces.rst +++ /dev/null @@ -1 +0,0 @@ -.. cmake-module:: ../../Modules/FindXerces.cmake diff --git a/Help/module/FindXercesC.rst b/Help/module/FindXercesC.rst new file mode 100644 index 0000000..4818071 --- /dev/null +++ b/Help/module/FindXercesC.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindXercesC.cmake diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst index 96717c6..a5b3e8e 100644 --- a/Help/release/3.1.0.rst +++ b/Help/release/3.1.0.rst @@ -245,6 +245,8 @@ Modules * The :module:`FindPkgConfig` module learned to use the ``PKG_CONFIG`` environment variable value as the ``pkg-config`` executable, if set. +* The :module:`FindXercesC` module was introduced. + * The :module:`FindZLIB` module now provides imported targets. * The :module:`GenerateExportHeader` module ``generate_export_header`` |