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

fix for debug libs on UNIX

Browse Source
This commit is contained in:
Ken Martin 2003-08-04 14:34:53 -04:00
parent 867f88a93f
commit 333562e8cc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -498,6 +498,9 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
std::string runtimeSep; std::string runtimeSep;
std::vector<std::string> runtimeDirs; std::vector<std::string> runtimeDirs;
std::string buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
buildType = cmSystemTools::UpperCase(buildType);
bool cxx = tgt.HasCxx(); bool cxx = tgt.HasCxx();
if(!cxx ) if(!cxx )
{ {
@ -577,8 +580,15 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
{ {
// Don't link the library against itself! // Don't link the library against itself!
if(targetLibrary && (lib->first == targetLibrary)) continue; if(targetLibrary && (lib->first == targetLibrary)) continue;
// don't look at debug libraries // use the correct lib for the current configuration
if (lib->second == cmTarget::DEBUG) continue; if (lib->second == cmTarget::DEBUG && buildType != "DEBUG")
{
continue;
}
if (lib->second == cmTarget::OPTIMIZED && buildType == "DEBUG")
{
continue;
}
// skip zero size library entries, this may happen // skip zero size library entries, this may happen
// if a variable expands to nothing. // if a variable expands to nothing.
if (lib->first.size() == 0) continue; if (lib->first.size() == 0) continue;