diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-21 12:53:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-21 12:53:16 (GMT) |
| commit | 5b241d0ae86569399275e1fc57b403cfb13f7c35 (patch) | |
| tree | 4107ef75fba221998adc65e0abdc92f3d88a9cb1 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 718daeb4e6b93527ea8fa0b87091008737b0a897 (diff) | |
| parent | cf320f7cd74eeb87437f737e6e977f2231e109a1 (diff) | |
| download | CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.zip CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.tar.gz CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.tar.bz2 | |
Merge topic '16760-refactor-get-mac-content-directory'
cf320f7c Replace boolean `implib` parameters with enum
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !662
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index f0f04a8..18b93f6 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1051,8 +1051,8 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged( std::string postfixName = cmSystemTools::UpperCase(config); postfixName += "_POSTFIX"; - std::string assemblyName = - this->GeneratorTarget->GetOutputName(config, false); + std::string assemblyName = this->GeneratorTarget->GetOutputName( + config, cmStateEnums::RuntimeBinaryArtifact); if (const char* postfix = this->GeneratorTarget->GetProperty(postfixName)) { assemblyName += postfix; } @@ -3014,8 +3014,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( std::string pdb = this->GeneratorTarget->GetPDBDirectory(config.c_str()); pdb += "/"; pdb += targetNamePDB; - std::string imLib = - this->GeneratorTarget->GetDirectory(config.c_str(), true); + std::string imLib = this->GeneratorTarget->GetDirectory( + config.c_str(), cmStateEnums::ImportLibraryArtifact); imLib += "/"; imLib += targetNameImport; |