diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-17 17:26:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-17 17:26:33 (GMT) |
| commit | f21d811c7c4c9b61c6c81414b3e8803db392183c (patch) | |
| tree | 2ae1ebd3c0c27ddb1ad8af408d20dfd2734ebf08 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | cd4ed3ecb2ecfe3e2043ae0338a02323a508e0dd (diff) | |
| parent | b8bb6ba653df9d53d93824bb7185bf022e9bf2ef (diff) | |
| download | CMake-f21d811c7c4c9b61c6c81414b3e8803db392183c.zip CMake-f21d811c7c4c9b61c6c81414b3e8803db392183c.tar.gz CMake-f21d811c7c4c9b61c6c81414b3e8803db392183c.tar.bz2 | |
Merge topic 'gem-string'
b8bb6ba653 cmGeneratorTarget::GetExportMacro: return const std::string*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2485
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 9b96f56..7383efd 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2566,8 +2566,9 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( configDefine += configName; configDefine += "\""; clOptions.AddDefine(configDefine); - if (const char* exportMacro = this->GeneratorTarget->GetExportMacro()) { - clOptions.AddDefine(exportMacro); + if (const std::string* exportMacro = + this->GeneratorTarget->GetExportMacro()) { + clOptions.AddDefine(*exportMacro); } if (this->MSTools) { @@ -2863,8 +2864,9 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions( configDefine += configName; configDefine += "\""; cudaOptions.AddDefine(configDefine); - if (const char* exportMacro = this->GeneratorTarget->GetExportMacro()) { - cudaOptions.AddDefine(exportMacro); + if (const std::string* exportMacro = + this->GeneratorTarget->GetExportMacro()) { + cudaOptions.AddDefine(*exportMacro); } // Get includes for this target |