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

ENH: Implemented new policy to choose the directory part of the object file name. This should keep the names looking as nice and short as possible. This partially addresses bug#4520.

Browse Source
This commit is contained in:
Brad King 2007-03-09 10:30:07 -05:00
parent 528f60f4a6
commit 54923d6ad8
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Source/cmLocalGenerator.cxx
View File

@ -2472,23 +2472,41 @@ std::string
cmLocalGenerator::GetObjectFileNameWithoutTarget(const cmSourceFile& source) cmLocalGenerator::GetObjectFileNameWithoutTarget(const cmSourceFile& source)
{ {
// Construct the object file name using the full path to the source // Construct the object file name using the full path to the source
// file which is its only unique identification. Convert the path // file which is its only unique identification.
// to be relative to the current binary directory if possible. const char* fullPath = source.GetFullPath().c_str();
std::string objectName = this->Convert(source.GetFullPath().c_str(),
START_OUTPUT); // Try referencing the source relative to the source tree.
if(cmSystemTools::FileIsFullPath(objectName.c_str()) || objectName.empty()) std::string relFromSource = this->Convert(fullPath, START);
assert(!relFromSource.empty());
bool relSource = !cmSystemTools::FileIsFullPath(relFromSource.c_str());
bool subSource = relSource && relFromSource[0] != '.';
// Try referencing the source relative to the binary tree.
std::string relFromBinary = this->Convert(fullPath, START_OUTPUT);
assert(!relFromBinary.empty());
bool relBinary = !cmSystemTools::FileIsFullPath(relFromBinary.c_str());
bool subBinary = relBinary && relFromBinary[0] != '.';
// Select a nice-looking reference to the source file to construct
// the object file name.
std::string objectName;
if((relSource && !relBinary) || (subSource && !subBinary))
{ {
// If the source file can be referenced as a relative path from objectName = relFromSource;
// the source tree use that relative path to construct the object
// name.
std::string relFromSource = this->Convert(source.GetFullPath().c_str(),
START);
if(!cmSystemTools::FileIsFullPath(relFromSource.c_str()) &&
!relFromSource.empty())
{
objectName = relFromSource;
}
} }
else if((relBinary && !relSource) || (subBinary && !subSource))
{
objectName = relFromBinary;
}
else if(relFromBinary.length() < relFromSource.length())
{
objectName = relFromBinary;
}
else
{
objectName = relFromSource;
}
// if it is still a full path check for the try compile case // if it is still a full path check for the try compile case
// try compile never have in source sources, and should not // try compile never have in source sources, and should not
// have conflicting source file names in the same target // have conflicting source file names in the same target