From 0838265fdcd72c52f8d626157968b4db2b342c3e Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 2 May 2002 19:09:12 -0400 Subject: [PATCH] check for optimized or debug library adds --- Source/cmTarget.cxx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 1f5387d22..d3f272649 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -343,8 +343,23 @@ void cmTarget::GatherDependencies( const cmMakefile& mf, std::string l = depline.substr( start, end-start ); if( l.size() != 0 ) { - const std::string cname = l; - lib_map[ cname ] = std::make_pair(l,GENERAL); // ** FIXME: we need to store the correct type here + const std::string cname = l; + std::string linkType = l; + linkType += "_LINK_TYPE"; + cmTarget::LinkLibraryType llt = cmTarget::GENERAL; + const char* linkTypeString = mf.GetDefinition( linkType.c_str() ); + if(linkTypeString) + { + if(strcmp(linkTypeString, "debug") == 0) + { + llt = cmTarget::DEBUG; + } + if(strcmp(linkTypeString, "optimized") == 0) + { + llt = cmTarget::OPTIMIZED; + } + } + lib_map[ cname ] = std::make_pair(l,llt); dep_map[ lib ].insert( cname ); GatherDependencies( mf, cname, dep_map, lib_map ); }