summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-20 13:33:03 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-20 13:33:03 (GMT)
commit57d4e1c77684986e26b5ebc6092564fc6cc1c655 (patch)
tree0d8a9d4ca850a84ce01c759239f971f227404691 /Help
parent20f64bd2dadbfe740e76d627523adf2161a515f3 (diff)
parenta41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (diff)
downloadCMake-57d4e1c77684986e26b5ebc6092564fc6cc1c655.zip
CMake-57d4e1c77684986e26b5ebc6092564fc6cc1c655.tar.gz
CMake-57d4e1c77684986e26b5ebc6092564fc6cc1c655.tar.bz2
Merge branch 'private-FindJsonCpp' into release
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-modules.7.rst1
-rw-r--r--Help/module/FindJsonCpp.rst1
-rw-r--r--Help/release/3.2.rst3
3 files changed, 0 insertions, 5 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index db56010..965eede 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -126,7 +126,6 @@ All Modules
/module/FindJava
/module/FindJNI
/module/FindJPEG
- /module/FindJsonCpp
/module/FindKDE3
/module/FindKDE4
/module/FindLAPACK
diff --git a/Help/module/FindJsonCpp.rst b/Help/module/FindJsonCpp.rst
deleted file mode 100644
index ba87ece..0000000
--- a/Help/module/FindJsonCpp.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/FindJsonCpp.cmake
diff --git a/Help/release/3.2.rst b/Help/release/3.2.rst
index 843d65d..8abb1ca 100644
--- a/Help/release/3.2.rst
+++ b/Help/release/3.2.rst
@@ -124,9 +124,6 @@ Modules
* A :module:`FindIntl` module was introduced to find the
Gettext ``libintl`` library.
-* A :module:`FindJsonCpp` module was introduced to find the
- JsonCpp package.
-
* The :module:`FindLATEX` module learned to support components.
* The :module:`FindMPI` module learned to find MS-MPI on Windows.