summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-02-10 21:16:56 (GMT)
committerBrad King <brad.king@kitware.com>2020-02-10 21:17:03 (GMT)
commit8752c1bd64e8eafd3aa73dae008b9a6efe9df3df (patch)
tree2bb7adc68219cd5c6e9f50a19cf041d41a16abe7 /Source/cmVisualStudio10TargetGenerator.cxx
parent155540d89eb5ac00fd8ba03a9580de2382af6386 (diff)
parente75632843480aefc303303b85350ecddcc57cc5e (diff)
downloadCMake-8752c1bd64e8eafd3aa73dae008b9a6efe9df3df.zip
CMake-8752c1bd64e8eafd3aa73dae008b9a6efe9df3df.tar.gz
CMake-8752c1bd64e8eafd3aa73dae008b9a6efe9df3df.tar.bz2
Merge branch 'backport-3.16-link-line-backtrace'
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6b45442..8da113e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3259,13 +3259,13 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions(
if (l.IsPath) {
std::string path = this->LocalGenerator->MaybeConvertToRelativePath(
- currentBinDir, l.Value);
+ currentBinDir, l.Value.Value);
ConvertToWindowsSlash(path);
- if (!cmVS10IsTargetsFile(l.Value)) {
+ if (!cmVS10IsTargetsFile(l.Value.Value)) {
libVec.push_back(path);
}
} else {
- libVec.push_back(l.Value);
+ libVec.push_back(l.Value.Value);
}
}
@@ -3819,9 +3819,9 @@ bool cmVisualStudio10TargetGenerator::ComputeLibOptions(
std::string currentBinDir =
this->LocalGenerator->GetCurrentBinaryDirectory();
for (cmComputeLinkInformation::Item const& l : libs) {
- if (l.IsPath && cmVS10IsTargetsFile(l.Value)) {
+ if (l.IsPath && cmVS10IsTargetsFile(l.Value.Value)) {
std::string path = this->LocalGenerator->MaybeConvertToRelativePath(
- currentBinDir, l.Value);
+ currentBinDir, l.Value.Value);
ConvertToWindowsSlash(path);
this->AddTargetsFileAndConfigPair(path, config);
}
@@ -3905,16 +3905,16 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
if (l.IsPath) {
std::string path = this->LocalGenerator->MaybeConvertToRelativePath(
- currentBinDir, l.Value);
+ currentBinDir, l.Value.Value);
ConvertToWindowsSlash(path);
- if (cmVS10IsTargetsFile(l.Value)) {
+ if (cmVS10IsTargetsFile(l.Value.Value)) {
vsTargetVec.push_back(path);
} else {
libVec.push_back(path);
}
} else if (!l.Target ||
l.Target->GetType() != cmStateEnums::INTERFACE_LIBRARY) {
- libVec.push_back(l.Value);
+ libVec.push_back(l.Value.Value);
}
}
}