diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-21 13:28:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-21 13:28:58 (GMT) |
| commit | cecd0d186db5a415ef9fe261310cba020eb040a2 (patch) | |
| tree | be8dfdd3c259bc0ebb953aa318297f73b2e30e87 | |
| parent | f9865743ed942b1932d664d136a4ad505b724bf6 (diff) | |
| parent | 3e94f94b898aa183badd2ac8be52d20b007d5b26 (diff) | |
| download | CMake-cecd0d186db5a415ef9fe261310cba020eb040a2.zip CMake-cecd0d186db5a415ef9fe261310cba020eb040a2.tar.gz CMake-cecd0d186db5a415ef9fe261310cba020eb040a2.tar.bz2 | |
Merge topic 'vs-fix-obj-extension'
3e94f94b cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)
| -rw-r--r-- | Source/cmLocalVisualStudioGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index ca72939..3588853 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -57,7 +57,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames( cmSourceFile const* sf = si->first; std::string objectNameLower = cmSystemTools::LowerCase( cmSystemTools::GetFilenameWithoutLastExtension(sf->GetFullPath())); - objectNameLower += ".obj"; + objectNameLower += this->GlobalGenerator->GetLanguageOutputExtension(*sf); counts[objectNameLower] += 1; } @@ -70,7 +70,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames( cmSourceFile const* sf = si->first; std::string objectName = cmSystemTools::GetFilenameWithoutLastExtension(sf->GetFullPath()); - objectName += ".obj"; + objectName += this->GlobalGenerator->GetLanguageOutputExtension(*sf); if(counts[cmSystemTools::LowerCase(objectName)] > 1) { const_cast<cmGeneratorTarget*>(gt)->AddExplicitObjectName(sf); |