Commit 1aaace3e authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'fix-VS-resources-pri-path'

646d01da VS: Use absolute target-specific directory for `resources.pri`
parents b12affd7 646d01da
......@@ -2736,8 +2736,10 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
<< "\\</AppxPackageArtifactsDir>\n";
this->WriteString("<ProjectPriFullPath>", 2);
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
<< "\\resources.pri</ProjectPriFullPath>\n";
std::string resourcePriFile =
this->DefaultArtifactDir + "/resources.pri";
(*this->BuildFileStream) << resourcePriFile << "</ProjectPriFullPath>\n";
// If we are missing files and we don't have a certificate and
// aren't targeting WP8.0, add a default certificate
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment