diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-04-02 18:09:06 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-04-02 18:09:06 (GMT) |
| commit | cf3e42f811e63d430557d0f4d659ea3a9bc69d4e (patch) | |
| tree | 69e307f83989ecc24afd478be17ecbf8f6750272 /Source | |
| parent | a63dc3271aa89b954101ec5472ef3fc3ec856507 (diff) | |
| download | CMake-cf3e42f811e63d430557d0f4d659ea3a9bc69d4e.zip CMake-cf3e42f811e63d430557d0f4d659ea3a9bc69d4e.tar.gz CMake-cf3e42f811e63d430557d0f4d659ea3a9bc69d4e.tar.bz2 | |
Partial fix from bug #10503, use full paths to fix custom commands.
This fixes tests ExternalProject and LinkDirectory for VS 2010.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudioGenerator.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 1af0d1d..8249d9e 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -236,7 +236,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() { std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash(); stampName += "generate.stamp"; - const char* dsprule = + const char* dsprule = this->Makefile->GetRequiredDefinition("CMAKE_COMMAND"); cmCustomCommandLine commandLine; commandLine.push_back(dsprule); @@ -261,7 +261,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() START_OUTPUT, UNCHANGED, true); commandLine.push_back(args); commandLine.push_back("--check-stamp-file"); - commandLine.push_back(stampName.c_str()); + std::string stampFilename = this->Convert(stampName.c_str(), FULL, + SHELL); + commandLine.push_back(stampFilename.c_str()); std::vector<std::string> const& listFiles = this->Makefile->GetListFiles(); diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index f3ed5b6..ed0b07f 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -169,7 +169,7 @@ cmLocalVisualStudioGenerator script += newline; newline = newline_text; script += "cd "; - script += this->Convert(workingDirectory, START_OUTPUT, SHELL); + script += this->Convert(workingDirectory, FULL, SHELL); // Change the working drive. if(workingDirectory[0] && workingDirectory[1] == ':') |