diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-30 14:07:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-30 14:07:27 (GMT) |
| commit | d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1 (patch) | |
| tree | 53b907fe4b492b3cc7cfc9b1b0984b28accc298f | |
| parent | 60b28de5c8c364d26824dbe2c2666ea47e8870a2 (diff) | |
| parent | 996e1885c4995e2d73712a7d0aaa0d615be5fdf0 (diff) | |
| download | CMake-d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1.zip CMake-d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1.tar.gz CMake-d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1.tar.bz2 | |
Merge topic 'server-deprecate'
996e1885c4 server: deprecate in favor of the file-api
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3251
| -rw-r--r-- | Help/manual/cmake-server.7.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/server-deprecate.rst | 6 | ||||
| -rw-r--r-- | Source/cmServerProtocol.cxx | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst index 25d364c..8f10b9f 100644 --- a/Help/manual/cmake-server.7.rst +++ b/Help/manual/cmake-server.7.rst @@ -7,6 +7,11 @@ cmake-server(7) .. contents:: +.. deprecated:: 3.15 + + This will be removed from a future version of CMake. + Clients should use the :manual:`cmake-file-api(7)` instead. + Introduction ============ diff --git a/Help/release/dev/server-deprecate.rst b/Help/release/dev/server-deprecate.rst new file mode 100644 index 0000000..65c86e1 --- /dev/null +++ b/Help/release/dev/server-deprecate.rst @@ -0,0 +1,6 @@ +server-deprecate +---------------- + +* The :manual:`cmake-server(7)` mode has been deprecated and will be + removed from a future version of CMake. Please port clients to use + the :manual:`cmake-file-api(7)` instead. diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 203ee93..dad8821 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -8,6 +8,7 @@ #include "cmGlobalGenerator.h" #include "cmJsonObjectDictionary.h" #include "cmJsonObjects.h" +#include "cmMessageType.h" #include "cmServer.h" #include "cmServerDictionary.h" #include "cmState.h" @@ -600,6 +601,10 @@ cmServerResponse cmServerProtocol1::ProcessConfigure( } int ret = cm->Configure(); + cm->IssueMessage( + MessageType::DEPRECATION_WARNING, + "The 'cmake-server(7)' is deprecated. " + "Please port clients to use the 'cmake-file-api(7)' instead."); if (ret < 0) { return request.ReportError("Configuration failed."); } |