diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:36:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-08 12:36:20 (GMT) |
| commit | 42d198744b8645ee35633c7af6e122d152bda8e9 (patch) | |
| tree | 118069052b6e13358d23ba1f37f1aede2b6fe9c0 /Tests | |
| parent | 65431c727b53ff092ad6f2f8c081982bdde52385 (diff) | |
| parent | b7c2b2cd78a8bc16cd7e294c2ae9d5d45f029e22 (diff) | |
| download | CMake-42d198744b8645ee35633c7af6e122d152bda8e9.zip CMake-42d198744b8645ee35633c7af6e122d152bda8e9.tar.gz CMake-42d198744b8645ee35633c7af6e122d152bda8e9.tar.bz2 | |
Merge topic 'deprecate_static_managed_targets'
b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets
d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting
1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target
8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib
73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2014
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt new file mode 100644 index 0000000..1ea3b51 --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-stderr.txt @@ -0,0 +1,3 @@ +^CMake Deprecation Warning in CMakeLists.txt: + The C# target "foo" is of type STATIC_LIBRARY. This is discouraged \(and + may be disabled in future\). Make it a SHARED library instead.$ diff --git a/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt b/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt new file mode 100644 index 0000000..4402b8f --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsCSharpReferenceProps-stderr.txt @@ -0,0 +1,8 @@ +^CMake Deprecation Warning in CMakeLists.txt: + The C# target "foo2" is of type STATIC_LIBRARY. This is discouraged \(and + may be disabled in future\). Make it a SHARED library instead. + + +CMake Deprecation Warning in CMakeLists.txt: + The C# target "foo" is of type STATIC_LIBRARY. This is discouraged \(and + may be disabled in future\). Make it a SHARED library instead.$ |