diff options
author | Brad King <brad.king@kitware.com> | 2017-09-27 11:14:05 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-27 11:15:12 (GMT) |
commit | 05e234cb1611aa7a7fe8e126468515c666eeeece (patch) | |
tree | 31f906c58161b6a62d09e1d631c8e2c4ebef7510 /Help/manual | |
parent | f75ac39692a3ec81f0e553dc4fa72c1b7f4165e7 (diff) | |
parent | 4603d6b0826c9b18b388809ab441b927fd72fb5a (diff) | |
download | CMake-05e234cb1611aa7a7fe8e126468515c666eeeece.zip CMake-05e234cb1611aa7a7fe8e126468515c666eeeece.tar.gz CMake-05e234cb1611aa7a7fe8e126468515c666eeeece.tar.bz2 |
Merge topic 'autogen-per-config-sources'
4603d6b0 Autogen: Docs: Add documentation internal links
f86ba8ee Autogen: Reintroduce per-config sources support
5d3bca64 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1307
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-qt.7.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst index 7052e0a..79e7e79 100644 --- a/Help/manual/cmake-qt.7.rst +++ b/Help/manual/cmake-qt.7.rst @@ -73,8 +73,8 @@ automatically added to the target's :prop_tgt:`INCLUDE_DIRECTORIES`. * This differs from CMake 3.7 and below; see their documentation for details. -* For multi configuration generators, the include directory is - ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. +* For :prop_gbl:`multi configuration generators <GENERATOR_IS_MULTI_CONFIG>`, + the include directory is ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. * See :prop_tgt:`AUTOGEN_BUILD_DIR`. @@ -133,8 +133,8 @@ automatically added to the target's :prop_tgt:`INCLUDE_DIRECTORIES`. * This differs from CMake 3.7 and below; see their documentation for details. -* For multi configuration generators, the include directory is - ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. +* For :prop_gbl:`multi configuration generators <GENERATOR_IS_MULTI_CONFIG>`, + the include directory is ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. * See :prop_tgt:`AUTOGEN_BUILD_DIR`. |