diff options
author | Brad King <brad.king@kitware.com> | 2017-06-06 13:09:41 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-06-07 13:41:49 (GMT) |
commit | cc1b513df143161e437c261cc385225cb4191d16 (patch) | |
tree | 6dd816a09617152a3465e3e7a74be9913b052d67 /Help/prop_tgt | |
parent | d025faf436c86ee9cc033fbb324a9bc2c18757fa (diff) | |
download | CMake-cc1b513df143161e437c261cc385225cb4191d16.zip CMake-cc1b513df143161e437c261cc385225cb4191d16.tar.gz CMake-cc1b513df143161e437c261cc385225cb4191d16.tar.bz2 |
Autogen: Do not use per-config file suffixes with VS yet
The change in commit v3.9.0-rc1~42^2~1 (Autogen: Per-config file
suffixes, 2017-05-15) broke Visual Studio builds because the generators
do not yet fully support per-config sources. Disable the behavior on
Visual Studio generators for now.
Fixes: #16939
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` |