diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-16 15:57:50 -0500 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-16 15:57:50 -0500 |
| commit | 0e5bde9aed9c84d2e0b3911e75f82f240d07e27b (patch) | |
| tree | bfb7e34d9cc35d5fbfb6e435c6fae20785c40589 | |
| parent | af08f67ff9be01372fbe658ca75cced93b68f278 (diff) | |
| download | cmake-0e5bde9aed9c84d2e0b3911e75f82f240d07e27b.tar.gz | |
ENH: move fix from main tree
| -rw-r--r-- | ChangeLog.manual | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual index df51cfc800..fc05ce359a 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -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 diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index dacb959ae0..72b215135f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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 |