summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-05 19:02:11 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-05 19:02:11 (GMT)
commitfad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1 (patch)
treeee35140d5b1a059eeab2afa1a086b5fe56ca970e /Help
parent03db9a061aa62eb2b373010a6a38d5707749a6d7 (diff)
parent27141eede739fb4376a6fe2cec1b1171841bf7fb (diff)
downloadCMake-fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1.zip
CMake-fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1.tar.gz
CMake-fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1.tar.bz2
Merge topic 'xerces-rename'
27141eed Modules: Rename FindXerces to FindXercesC
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-modules.7.rst2
-rw-r--r--Help/module/FindXerces.rst1
-rw-r--r--Help/module/FindXercesC.rst1
-rw-r--r--Help/release/3.1.0.rst2
4 files changed, 4 insertions, 2 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 083ed7a..8337118 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -209,7 +209,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``