summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio8Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-06 15:29:46 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-02-06 15:29:46 (GMT)
commit811c854efffba6f97bb3038b651fed7fc1bcf2be (patch)
tree94d47fab0d91bde5c10cdd0f28f18fadc3376011 /Source/cmGlobalVisualStudio8Generator.cxx
parentcf1bc84216ac5005301836b121d574ec90d9212a (diff)
parentf8f3cb8d65d3ddbd8840814df7df884a2714b88e (diff)
downloadCMake-811c854efffba6f97bb3038b651fed7fc1bcf2be.zip
CMake-811c854efffba6f97bb3038b651fed7fc1bcf2be.tar.gz
CMake-811c854efffba6f97bb3038b651fed7fc1bcf2be.tar.bz2
Merge topic 'vs-quote-rerun-paths'
f8f3cb8d VS: Fix quoting of special characters in cmake re-run check commands
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio8Generator.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e961a3d..8353a3f 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -298,7 +298,9 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
commandLine.push_back("--check-stamp-list");
commandLine.push_back(stampList.c_str());
commandLine.push_back("--vs-solution-file");
- commandLine.push_back("\"$(SolutionPath)\"");
+ std::string const sln = std::string(lg->GetBinaryDirectory()) + "/" +
+ lg->GetProjectName() + ".sln";
+ commandLine.push_back(sln);
cmCustomCommandLines commandLines;
commandLines.push_back(commandLine);
@@ -310,7 +312,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
std::vector<std::string> no_byproducts;
if (cmSourceFile* file = mf->AddCustomCommandToOutput(
stamps, no_byproducts, listFiles, no_main_dependency, commandLines,
- "Checking Build System", no_working_directory, true)) {
+ "Checking Build System", no_working_directory, true, false)) {
gt->AddSource(file->GetFullPath());
} else {
cmSystemTools::Error("Error adding rule for ", stamps[0].c_str());