浏览代码

Merge topic 'doc-debug-find-pkg-var' into release-3.23

8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name
546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6977
Brad King 3 年之前
父节点
当前提交
ba1f706768
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 5 4
      Help/manual/cmake.1.rst
  2. 1 1
      Source/cmake.h

+ 5 - 4
Help/manual/cmake.1.rst

@@ -250,16 +250,17 @@ Options
  See also the :variable:`CMAKE_FIND_DEBUG_MODE` variable for debugging
  a more local part of the project.
 
-``--debug-find=<pkg>[,...]``
+``--debug-find-pkg=<pkg>[,...]``
  Put cmake find commands in a debug mode when running under calls
- to ``find_package(<pkg>)``, where ``<pkg>`` is an entry in the given
- comma-separated list of case-sensitive package names.
+ to :command:`find_package(\<pkg\>) <find_package>`, where ``<pkg>``
+ is an entry in the given comma-separated list of case-sensitive package
+ names.
 
  Like ``--debug-find``, but limiting scope to the specified packages.
 
 ``--debug-find-var=<var>[,...]``
  Put cmake find commands in a debug mode when called with ``<var>``
- as the return variable, where ``<var>`` is an entry in the given
+ as the result variable, where ``<var>`` is an entry in the given
  comma-separated list.
 
  Like ``--debug-find``, but limiting scope to the specified variable names.

+ 1 - 1
Source/cmake.h

@@ -488,7 +488,7 @@ public:
   //! Do we want debug output from the find commands during the cmake run.
   bool GetDebugFindOutput() const { return this->DebugFindOutput; }
   bool GetDebugFindOutput(std::string const& var) const;
-  bool GetDebugFindPkgOutput(std::string const& var) const;
+  bool GetDebugFindPkgOutput(std::string const& pkg) const;
   void SetDebugFindOutput(bool b) { this->DebugFindOutput = b; }
   void SetDebugFindOutputPkgs(std::string const& args);
   void SetDebugFindOutputVars(std::string const& args);