[cmake-commits] hoffman committed cmLocalGenerator.cxx 1.213 1.214

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv29860/Source

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
ENH: fix it so that the FRAMEWORK property does not break the building of normal shared libs on non-mac platforms


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- cmLocalGenerator.cxx	8 May 2007 14:32:54 -0000	1.213
+++ cmLocalGenerator.cxx	8 May 2007 15:53:39 -0000	1.214
@@ -1728,7 +1728,12 @@
           // off the per-configuration subdirectory.  The link directory
           // ordering knows how to deal with this.
           linkItem += tgt->GetDirectory(0, implib);
+          // on apple if the FRAMEWORK prop is set, then
+          // do not add the target full name but just use the directory
+          // name
+#ifdef __APPLE__
           if(!tgt->GetPropertyAsBool("FRAMEWORK"))
+#endif
             { 
             linkItem += "/";
             linkItem += tgt->GetFullName(config, implib);