diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-06 13:38:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-06 13:38:36 (GMT) |
| commit | da9fe11b98ae9b176c1fbee8afb2cacddacf0c11 (patch) | |
| tree | 0d26ece4efa2bab097f8fdfe760045aa96f0d4a0 /Help | |
| parent | 0ef6b24988c1ea94760f4cbaf68862b5a2534f0e (diff) | |
| parent | 227de0b95d6fd12e47da502ce34e8aea6d57cc43 (diff) | |
| download | CMake-da9fe11b98ae9b176c1fbee8afb2cacddacf0c11.zip CMake-da9fe11b98ae9b176c1fbee8afb2cacddacf0c11.tar.gz CMake-da9fe11b98ae9b176c1fbee8afb2cacddacf0c11.tar.bz2 | |
Merge topic 'include_external_msproject-map-config'
227de0b9 include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>
4cd815f0 VS: Pass whole target to WriteProjectConfigurations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !669
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/include_external_msproject.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/include_external_msproject-map-config.rst | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Help/command/include_external_msproject.rst b/Help/command/include_external_msproject.rst index 18a2b50..335282a 100644 --- a/Help/command/include_external_msproject.rst +++ b/Help/command/include_external_msproject.rst @@ -20,3 +20,7 @@ command to make things depend on the external project. specify the type of project, id (GUID) of the project and the name of the target platform. This is useful for projects requiring values other than the default (e.g. WIX projects). + +If the imported project has different configuration names than the +current project, set the :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` +target property to specify the mapping. diff --git a/Help/release/dev/include_external_msproject-map-config.rst b/Help/release/dev/include_external_msproject-map-config.rst new file mode 100644 index 0000000..d5f7a7f --- /dev/null +++ b/Help/release/dev/include_external_msproject-map-config.rst @@ -0,0 +1,6 @@ +include_external_msproject-map-config +------------------------------------- + +* The :command:`include_external_msproject` command learned to use + the :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` target property + to map current configurations to the external configurations. |