diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-12 15:36:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-12 15:36:28 (GMT) |
| commit | 498be66fd7211fb782eaac8be7c2b0e50e3ab5da (patch) | |
| tree | 2bf6aa9f7a8132b8585bcc53394df3802a6f34b4 /Help/manual | |
| parent | 2cdefcbe62707a82eccbc301fe34f85bb74d932a (diff) | |
| parent | 312527de473692e17f2b858a87faa157c73e488f (diff) | |
| download | CMake-498be66fd7211fb782eaac8be7c2b0e50e3ab5da.zip CMake-498be66fd7211fb782eaac8be7c2b0e50e3ab5da.tar.gz CMake-498be66fd7211fb782eaac8be7c2b0e50e3ab5da.tar.bz2 | |
Merge topic 'add_support_for_clr_targets'
312527de47 document COMMON_LANGUAGE_RUNTIME target properties
4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property
20e31fb4c9 cmExportFileGenerator: add target property for managed targets
411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary()
fb433ff283 cmGeneratorTarget: Make import library checks config-aware
4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods
6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1916
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 7ace270..d141479 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -143,6 +143,7 @@ Properties on Targets /prop_tgt/C_EXTENSIONS /prop_tgt/C_STANDARD /prop_tgt/C_STANDARD_REQUIRED + /prop_tgt/COMMON_LANGUAGE_RUNTIME /prop_tgt/COMPATIBLE_INTERFACE_BOOL /prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX /prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN @@ -186,6 +187,7 @@ Properties on Targets /prop_tgt/GNUtoMS /prop_tgt/HAS_CXX /prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM + /prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME /prop_tgt/IMPORTED_CONFIGURATIONS /prop_tgt/IMPORTED_GLOBAL /prop_tgt/IMPORTED_IMPLIB_CONFIG |