diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-23 15:06:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-23 15:06:44 (GMT) |
| commit | 35fe47bd5d9508aa90fd1569eb2eaf3f982ebee5 (patch) | |
| tree | a38423d4786401b339eb17809c1828feb67d8450 | |
| parent | 718033b97d56d97cb0b16d82cb5fdd565d6b2b83 (diff) | |
| parent | d004d8c59a6daa5b27c6e737b687793f51557704 (diff) | |
| download | CMake-35fe47bd5d9508aa90fd1569eb2eaf3f982ebee5.zip CMake-35fe47bd5d9508aa90fd1569eb2eaf3f982ebee5.tar.gz CMake-35fe47bd5d9508aa90fd1569eb2eaf3f982ebee5.tar.bz2 | |
Merge branch 'vs-csharp-in-custom-target' into release-3.13
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 2d39cbb..09c08d3 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1133,6 +1133,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 |