diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-29 20:26:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-29 20:26:07 (GMT) |
| commit | cb9e86706c4de9ddc39dabbf2ccf3daa9ee4d189 (patch) | |
| tree | 9259987f92c05613b8d0d440f85415c61abe1268 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | a22570ea19904b08afae204f378c6f5febd7f534 (diff) | |
| parent | c655f0c417f66096a62bb837e163ec636665dd69 (diff) | |
| download | CMake-cb9e86706c4de9ddc39dabbf2ccf3daa9ee4d189.zip CMake-cb9e86706c4de9ddc39dabbf2ccf3daa9ee4d189.tar.gz CMake-cb9e86706c4de9ddc39dabbf2ccf3daa9ee4d189.tar.bz2 | |
Merge topic 'vs-minor-cleanups'
c655f0c4 VS: Drop GenerateManifest from .vcxproj files for non-MS tools
227a3367 VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions
4a24015a Tests: Always detect VS and SDK availability on Windows
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 8e73169..a8357a7 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1130,7 +1130,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf) bool toolHasSettings = false; std::string tool = "None"; std::string shaderType; - std::string const& ext = sf->GetExtension(); + std::string ext = cmSystemTools::LowerCase(sf->GetExtension()); if(ext == "hlsl") { tool = "FXCompile"; @@ -1597,6 +1597,10 @@ void cmVisualStudio10TargetGenerator:: OutputLinkIncremental(std::string const& configName) { + if(!this->MSTools) + { + return; + } // static libraries and things greater than modules do not need // to set this option if(this->Target->GetType() == cmTarget::STATIC_LIBRARY |