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

COMP: Fixed enumeration-not-used warning in switch.

This commit is contained in:
Brad King 2007-03-08 15:10:20 -05:00
parent 33ee83714d
commit 1a734f238a
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmTarget.cxx
View File

@ -1936,18 +1936,17 @@ const char* cmTarget::GetOutputDir()
if(this->OutputDir.empty()) if(this->OutputDir.empty())
{ {
// Lookup the output path for this target type. // Lookup the output path for this target type.
switch(this->GetType()) if(this->GetType() == cmTarget::EXECUTABLE)
{ {
case cmTarget::STATIC_LIBRARY:
case cmTarget::MODULE_LIBRARY:
case cmTarget::SHARED_LIBRARY:
this->OutputDir =
this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
break;
case cmTarget::EXECUTABLE:
this->OutputDir = this->OutputDir =
this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"); this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
break; }
else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
this->GetType() == cmTarget::SHARED_LIBRARY ||
this->GetType() == cmTarget::MODULE_LIBRARY)
{
this->OutputDir =
this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
} }
if(this->OutputDir.empty()) if(this->OutputDir.empty())
{ {
@ -1968,10 +1967,16 @@ const char* cmTarget::GetOutputDir()
this->OutputDir.c_str()); this->OutputDir.c_str());
} }
// TODO: This came from cmLocalUnixMakefileGenerator3::FormatOutputPath. // This came from cmLocalUnixMakefileGenerator3::FormatOutputPath.
// Where should it go. Is it still needed? // Where should it go? Is it still needed? I do not think so
// because target full paths are split into -Ldir -llib
// automatically.
//
// Add this as a link directory automatically. // Add this as a link directory automatically.
// this->Makefile->AddLinkDirectory(path.c_str()); // this->Makefile->AddLinkDirectory(path.c_str());
//
// Should it be this?
// this->AddLinkDirectory(this->OutputDir.c_str());
} }
return this->OutputDir.c_str(); return this->OutputDir.c_str();