[cmake-commits] king committed cmGlobalVisualStudio71Generator.cxx 1.44 1.45

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio71Generator.cxx 
Log Message:
BUG: Disable static lib deps until a global cycle removal can be done.


Index: cmGlobalVisualStudio71Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.cxx,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cmGlobalVisualStudio71Generator.cxx	21 Dec 2007 20:04:06 -0000	1.44
+++ cmGlobalVisualStudio71Generator.cxx	23 Dec 2007 18:13:44 -0000	1.45
@@ -317,6 +317,7 @@
                       const char* dspname,
                       const char*, cmTarget& target)
 {
+#if 0
   // Create inter-target dependencies in the solution file.  For VS
   // 7.1 and below we cannot let static libraries depend directly on
   // targets to which they "link" because the librarian tool will copy
@@ -324,7 +325,10 @@
   // cmGlobalVisualStudioGenerator::FixUtilityDependsForTarget for a
   // work-around.  VS 8 and above do not have this problem.
   if (!this->VSLinksDependencies() ||
-      target.GetType() != cmTarget::STATIC_LIBRARY)
+      target.GetType() != cmTarget::STATIC_LIBRARY);
+#else
+  if (target.GetType() != cmTarget::STATIC_LIBRARY)
+#endif
     {
     cmTarget::LinkLibraryVectorType::const_iterator j, jend;
     j = target.GetLinkLibraries().begin();