[cmake-commits] hoffman committed cmMakefile.cxx 1.335.2.9 1.335.2.10
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 20 14:23:47 EST 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23865
Modified Files:
Tag: CMake-2-4
cmMakefile.cxx
Log Message:
ENH: fix from main tree
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.335.2.9
retrieving revision 1.335.2.10
diff -u -d -r1.335.2.9 -r1.335.2.10
--- cmMakefile.cxx 17 Nov 2006 20:55:42 -0000 1.335.2.9
+++ cmMakefile.cxx 20 Nov 2006 19:23:45 -0000 1.335.2.10
@@ -954,11 +954,16 @@
}
}
}
- // make sure the tpye is correct
+ // make sure the type is correct if it is currently
+ // general. So if you do a
+ // target_link_libraries(foo optimized bar) it will stay
+ // optimized and not use the lookup. As there maybe the
+ // case where someone has specifed that a library is both
+ // debug and optimized.
std::string linkType = lib;
linkType += "_LINK_TYPE";
const char* linkTypeString = this->GetDefinition( linkType.c_str() );
- if(linkTypeString)
+ if(llt == cmTarget::GENERAL && linkTypeString)
{
if(strcmp(linkTypeString, "debug") == 0)
{
More information about the Cmake-commits
mailing list