diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-24 14:40:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-24 14:40:24 (GMT) |
| commit | 3793bed9df0c7f056eaf85c0267088fc8cea647c (patch) | |
| tree | 7e19f26f0baacc5bc756e90f287814567f6d8e22 | |
| parent | 008cb6aa991a515cd31a9b7e6a5837555ff2d43a (diff) | |
| parent | d004d8c59a6daa5b27c6e737b687793f51557704 (diff) | |
| download | CMake-3793bed9df0c7f056eaf85c0267088fc8cea647c.zip CMake-3793bed9df0c7f056eaf85c0267088fc8cea647c.tar.gz CMake-3793bed9df0c7f056eaf85c0267088fc8cea647c.tar.bz2 | |
Merge topic 'vs-csharp-in-custom-target'
d004d8c59a VS: Fix crash on CSharp sources in a custom target
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2515
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 | ||||
| -rw-r--r-- | Tests/CSharpOnly/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/CSharpOnly/empty.cs | 0 | ||||
| -rw-r--r-- | Tests/CSharpOnly/empty.txt | 0 |
4 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7383efd..eb1a27e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1122,6 +1122,10 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues( void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged( Elem& e1, std::string const& config) { + if (this->GeneratorTarget->GetType() > cmStateEnums::OBJECT_LIBRARY) { + return; + } + cmGlobalVisualStudio10Generator* gg = this->GlobalGenerator; Options& o = *(this->ClOptions[config]); diff --git a/Tests/CSharpOnly/CMakeLists.txt b/Tests/CSharpOnly/CMakeLists.txt index 0e3e39e..84b58ca 100644 --- a/Tests/CSharpOnly/CMakeLists.txt +++ b/Tests/CSharpOnly/CMakeLists.txt @@ -8,3 +8,6 @@ add_library(lib2 SHARED lib2.cs) add_executable(CSharpOnly csharponly.cs) target_link_libraries(CSharpOnly lib1 lib2) + +add_custom_target(CSharpCustom SOURCES empty.cs) +add_custom_target(custom.cs DEPENDS empty.txt) diff --git a/Tests/CSharpOnly/empty.cs b/Tests/CSharpOnly/empty.cs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/CSharpOnly/empty.cs diff --git a/Tests/CSharpOnly/empty.txt b/Tests/CSharpOnly/empty.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/CSharpOnly/empty.txt |