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

Default the working dir to the current binary dir

Browse Source 
Keep backwards compatability with CMake <= 2.8.3.
This commit is contained in:
Ben Boeckel 2011-01-20 13:52:42 -05:00
parent 0594287606
commit b6c302b1aa
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/cmAddTestCommand.cxx
View File

@ -74,7 +74,8 @@ bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args)
{ {
std::string name; std::string name;
std::vector<std::string> configurations; std::vector<std::string> configurations;
std::string working_directory; std::string working_directory = this->Makefile->GetCurrentOutputDirectory();
bool working_directory_set = false;
std::vector<std::string> command; std::vector<std::string> command;
// Read the arguments. // Read the arguments.
@ -108,12 +109,13 @@ bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args)
} }
else if(args[i] == "WORKING_DIRECTORY") else if(args[i] == "WORKING_DIRECTORY")
{ {
if(!working_directory.empty()) if(working_directory_set)
{ {
this->SetError(" may be given at most one WORKING_DIRECTORY."); this->SetError(" may be given at most one WORKING_DIRECTORY.");
return false; return false;
} }
doing = DoingWorkingDirectory; doing = DoingWorkingDirectory;
working_directory_set = true;
} }
else if(doing == DoingName) else if(doing == DoingName)
{ {