mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

BUG: use ./ infront of the current directory

Browse Source
This commit is contained in:
Bill Hoffman
2003-12-29 14:55:43 -05:00
parent 46aaf2dae8
commit b753a6794b
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalUnixMakefileGenerator.cxx
+9 -3
View File
@@ -1324,11 +1324,11 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
target += cmSystemTools::GetExecutableExtension();
target = this->ConvertToRelativeOutputPath(target.c_str());
bool needsLocalTarget = false;
if(target.find('/') != target.npos)
if(target.find('/', 2) != target.npos)
{
needsLocalTarget = true;
}
std::string objs = "$(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") ";
std::string depend = "$(";
depend += this->CreateMakeVariable(name, "_SRC_OBJS")
@@ -1922,7 +1922,13 @@ BuildInSubDirectoryWindows(std::ostream& fout,
std::string currentDir = dir;
cmSystemTools::ConvertToUnixSlashes(currentDir);
std::string cdback = "..";
for(unsigned int i =0; i < currentDir.size(); ++i)
unsigned int i = 0;
if(currentDir.size() > 2 && currentDir[0] == '.' && currentDir[1] == '/')
{
// start past ./ if it starts with ./
i = 2;
}
for(; i < currentDir.size(); ++i)
{
if(currentDir[i] == '/')
{