diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-05 14:25:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-05 14:25:16 (GMT) |
| commit | 02d031827d824e15e902b95f833b77ca7379bde4 (patch) | |
| tree | e778fb6b373846fc4162dd78b60742866e20f471 | |
| parent | 9042c875dcbd0f4b7150e9050b60fb0d40365e45 (diff) | |
| parent | f9839c491ef926b71487345fdcc7054324587168 (diff) | |
| download | CMake-02d031827d824e15e902b95f833b77ca7379bde4.zip CMake-02d031827d824e15e902b95f833b77ca7379bde4.tar.gz CMake-02d031827d824e15e902b95f833b77ca7379bde4.tar.bz2 | |
Merge topic 'update-docs'
f9839c49 Help: Document build targets automatically added to console pool.
44d6f3ce Help: Add some cross-linking.
| -rw-r--r-- | Help/command/add_custom_command.rst | 2 | ||||
| -rw-r--r-- | Help/command/add_custom_target.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-packages.7.rst | 2 | ||||
| -rw-r--r-- | Help/prop_gbl/JOB_POOLS.rst | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst index 1307a58..e646c56 100644 --- a/Help/command/add_custom_command.rst +++ b/Help/command/add_custom_command.rst @@ -147,7 +147,7 @@ The options are: ``USES_TERMINAL`` The command will be given direct access to the terminal if possible. With the :generator:`Ninja` generator, this places the command in - the ``console`` pool. + the ``console`` :prop_gbl:`pool <JOB_POOLS>`. ``VERBATIM`` All arguments to the commands will be escaped properly for the diff --git a/Help/command/add_custom_target.rst b/Help/command/add_custom_target.rst index 5134a70..82d69db 100644 --- a/Help/command/add_custom_target.rst +++ b/Help/command/add_custom_target.rst @@ -103,7 +103,7 @@ The options are: ``USES_TERMINAL`` The command will be given direct access to the terminal if possible. With the :generator:`Ninja` generator, this places the command in - the ``console`` pool. + the ``console`` :prop_gbl:`pool <JOB_POOLS>`. ``WORKING_DIRECTORY`` Execute the command with the given current working directory. diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index fba1d61..3367ba4 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -358,7 +358,7 @@ and a ``cmake/ClimbingStatsConfig.cmake`` are installed to the same location, completing the package. The generated :prop_tgt:`IMPORTED` targets have appropriate properties set -to define their usage requirements, such as +to define their :ref:`usage requirements <Target Usage Requirements>`, such as :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`, :prop_tgt:`INTERFACE_COMPILE_DEFINITIONS` and other relevant built-in ``INTERFACE_`` properties. The ``INTERFACE`` variant of user-defined diff --git a/Help/prop_gbl/JOB_POOLS.rst b/Help/prop_gbl/JOB_POOLS.rst index 98b9f7e..2ce74b8 100644 --- a/Help/prop_gbl/JOB_POOLS.rst +++ b/Help/prop_gbl/JOB_POOLS.rst @@ -18,3 +18,6 @@ Defined pools could be used globally by setting :variable:`CMAKE_JOB_POOL_COMPILE` and :variable:`CMAKE_JOB_POOL_LINK` or per target by setting the target properties :prop_tgt:`JOB_POOL_COMPILE` and :prop_tgt:`JOB_POOL_LINK`. + +Build targets provided by CMake that are meant for individual interactive +use, such as ``install``, are placed in the ``console`` pool automatically. |