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

BUG: don't crash in the generator is EXECUTABLE_OUTPUT_PATH or 

LIBRARY_OUTPUT_PATH are empty

Alex
This commit is contained in:
Alexander Neundorf 2008-08-06 15:35:52 -04:00
parent b853e9c19f
commit 138c8a0dab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -351,7 +351,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
} }
} }
// for EXECUTABLE_OUTPUT_PATH when not in binary dir // for EXECUTABLE_OUTPUT_PATH when not in binary dir
std::string outputPath = mf->GetDefinition("EXECUTABLE_OUTPUT_PATH"); std::string outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
if (!outputPath.empty() && !cmSystemTools::IsSubDirectory( if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
outputPath.c_str(), this->HomeOutputDirectory.c_str())) outputPath.c_str(), this->HomeOutputDirectory.c_str()))
{ {
@ -368,9 +368,9 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
this->OutLinkedResources.push_back(name); this->OutLinkedResources.push_back(name);
} }
// for LIBRARY_OUTPUT_PATH when not in binary dir // for LIBRARY_OUTPUT_PATH when not in binary dir
if (outputPath != mf->GetDefinition("LIBRARY_OUTPUT_PATH")) if (outputPath != mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"))
{ {
outputPath = mf->GetDefinition("LIBRARY_OUTPUT_PATH"); outputPath = mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
if (!outputPath.empty() && !cmSystemTools::IsSubDirectory( if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
outputPath.c_str(), this->HomeOutputDirectory.c_str())) outputPath.c_str(), this->HomeOutputDirectory.c_str()))
{ {