kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Use absolute target-specific directory for `resources.pri` 

The change in commit v3.7.0-rc1~219^2 (VS: Use target-specific directory
for `resources.pri`, 2016-08-25) incorrectly specifies a relative path
for the `ProjectPriFullPath` value.  Fix it to use an absolute path.

Issue: #16106
This commit is contained in:
Roman Wüger 2016-10-04 23:02:28 +02:00 committed by Brad King
parent b99bbfe88d
commit 646d01da95
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2736,8 +2736,10 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
<< "\\</AppxPackageArtifactsDir>\n"; << "\\</AppxPackageArtifactsDir>\n";
this->WriteString("<ProjectPriFullPath>", 2); this->WriteString("<ProjectPriFullPath>", 2);
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) std::string resourcePriFile =
<< "\\resources.pri</ProjectPriFullPath>\n"; this->DefaultArtifactDir + "/resources.pri";
this->ConvertToWindowsSlash(resourcePriFile);
(*this->BuildFileStream) << resourcePriFile << "</ProjectPriFullPath>\n";
// If we are missing files and we don't have a certificate and // If we are missing files and we don't have a certificate and
// aren't targeting WP8.0, add a default certificate // aren't targeting WP8.0, add a default certificate