diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-23 15:26:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-23 15:26:30 (GMT) |
| commit | 1eb192905d81943073c3cbdd56b665e80e235087 (patch) | |
| tree | 77b20ff3b32e67fba1aeb335c4acea02045e6e8a /Help | |
| parent | 6adff767208c2238efb2649395a76bc2ea78fb08 (diff) | |
| parent | a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (diff) | |
| download | CMake-1eb192905d81943073c3cbdd56b665e80e235087.zip CMake-1eb192905d81943073c3cbdd56b665e80e235087.tar.gz CMake-1eb192905d81943073c3cbdd56b665e80e235087.tar.bz2 | |
Merge topic 'private-FindJsonCpp'
a41d621d bootstrap: Add --(no-)system-jsoncpp options
a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 1 | ||||
| -rw-r--r-- | Help/module/FindJsonCpp.rst | 1 | ||||
| -rw-r--r-- | Help/release/3.2.rst | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 76058f9..2b26cc9 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -127,7 +127,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. |