Commit 0e5bde9a authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: move fix from main tree

parent af08f67f
......@@ -163,6 +163,8 @@ Changes in CMake 2.4.4
* Add depends from files inside qrc files in qt
* Fix explort_library_depends to work with optimized and debug
Changes in CMake 2.4.3
* fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler
......
......@@ -954,6 +954,21 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
}
}
}
// make sure the tpye is correct
std::string linkType = lib;
linkType += "_LINK_TYPE";
const char* linkTypeString = this->GetDefinition( linkType.c_str() );
if(linkTypeString)
{
if(strcmp(linkTypeString, "debug") == 0)
{
llt = cmTarget::DEBUG;
}
if(strcmp(linkTypeString, "optimized") == 0)
{
llt = cmTarget::OPTIMIZED;
}
}
i->second.AddLinkLibrary( *this, target, lib, llt );
}
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment