diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-07 14:01:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-07 14:01:18 (GMT) |
| commit | b9d411eb258476a0eb603ac078b01b335661714a (patch) | |
| tree | ead8bd1e3a641504116014403873c2d971c676a2 /Help/prop_tgt | |
| parent | 5f8271962b3498ba0e2cb3756afa8f785b275e78 (diff) | |
| parent | cc1b513df143161e437c261cc385225cb4191d16 (diff) | |
| download | CMake-b9d411eb258476a0eb603ac078b01b335661714a.zip CMake-b9d411eb258476a0eb603ac078b01b335661714a.tar.gz CMake-b9d411eb258476a0eb603ac078b01b335661714a.tar.bz2 | |
Merge branch 'autogen-no-vs-per-config' into release-3.9
Diffstat (limited to 'Help/prop_tgt')
| -rw-r--r-- | Help/prop_tgt/AUTOMOC.rst | 7 | ||||
| -rw-r--r-- | Help/prop_tgt/AUTOUIC.rst | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst index 81eff82..0171d20 100644 --- a/Help/prop_tgt/AUTOMOC.rst +++ b/Help/prop_tgt/AUTOMOC.rst @@ -20,9 +20,6 @@ source files at build time and invoke moc accordingly. This allows the compiler to find the included ``moc_<basename>.cpp`` file regardless of the location the original source. - * For multi configuration generators, except Xcode, the include directory is - ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. - * See :prop_tgt:`AUTOGEN_BUILD_DIR`. * If an ``#include`` statement like ``#include "<basename>.moc"`` is found, @@ -36,10 +33,6 @@ source files at build time and invoke moc accordingly. ``<AUTOGEN_BUILD_DIR>/mocs_compilation.cpp`` file, which is compiled as part of the target. - * For multi configuration generators, except Xcode, the file names are - ``moc_<basename>_<CONFIG>.cpp`` and - ``<AUTOGEN_BUILD_DIR>/mocs_compilation_<CONFIG>.cpp``. - * The custom directories with checksum based names help to avoid name collisions for moc files with the same ``<basename>``. diff --git a/Help/prop_tgt/AUTOUIC.rst b/Help/prop_tgt/AUTOUIC.rst index 4a08072..6493bbc 100644 --- a/Help/prop_tgt/AUTOUIC.rst +++ b/Help/prop_tgt/AUTOUIC.rst @@ -17,9 +17,6 @@ optional :prop_tgt:`AUTOUIC_SEARCH_PATHS` of the target. ``<AUTOGEN_BUILD_DIR>/include``, which is automatically added to the target's :prop_tgt:`INCLUDE_DIRECTORIES`. -* For multi configuration generators, except Xcode, the include directory is - ``<AUTOGEN_BUILD_DIR>/include_<CONFIG>``. - * See :prop_tgt:`AUTOGEN_BUILD_DIR`. This property is initialized by the value of the :variable:`CMAKE_AUTOUIC` |