diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-06 15:29:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-06 15:29:46 (GMT) |
| commit | 811c854efffba6f97bb3038b651fed7fc1bcf2be (patch) | |
| tree | 94d47fab0d91bde5c10cdd0f28f18fadc3376011 | |
| parent | cf1bc84216ac5005301836b121d574ec90d9212a (diff) | |
| parent | f8f3cb8d65d3ddbd8840814df7df884a2714b88e (diff) | |
| download | CMake-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
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 6 |
2 files changed, 6 insertions, 6 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()); diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 49b057b..38dda04 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -260,9 +260,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() args += this->GetBinaryDirectory(); commandLine.push_back(args); commandLine.push_back("--check-stamp-file"); - std::string stampFilename = this->ConvertToOutputFormat( - cmSystemTools::CollapseFullPath(stampName), cmOutputConverter::SHELL); - commandLine.push_back(stampFilename.c_str()); + commandLine.push_back(stampName); std::vector<std::string> const& listFiles = this->Makefile->GetListFiles(); @@ -273,7 +271,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() cmSystemTools::CollapseFullPath(stampName.c_str()); this->Makefile->AddCustomCommandToOutput( fullpathStampName.c_str(), listFiles, makefileIn.c_str(), commandLines, - comment.c_str(), no_working_directory, true); + comment.c_str(), no_working_directory, true, false); if (cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str())) { return file; } else { |