[cmake-commits] hoffman committed cmAddLibraryCommand.cxx 1.24.2.1 1.24.2.2 cmGlobalGenerator.cxx 1.137.2.11 1.137.2.12

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmAddLibraryCommand.cxx cmGlobalGenerator.cxx 
Log Message:
ENH: merge in a few more fixes from the main tree


Index: cmAddLibraryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddLibraryCommand.cxx,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- cmAddLibraryCommand.cxx	13 Oct 2006 14:52:02 -0000	1.24.2.1
+++ cmAddLibraryCommand.cxx	1 Jun 2007 15:18:49 -0000	1.24.2.2
@@ -38,8 +38,8 @@
   
   // If the second argument is "SHARED" or "STATIC", then it controls
   // the type of library.  Otherwise, it is treated as a source or
-  // source list name.
-  if(s != args.end())
+  // source list name. There man be two keyword arguments, check for them
+  while ( s != args.end() )
     {
     std::string libType = *s;
     if(libType == "STATIC")
@@ -62,6 +62,10 @@
       ++s;
       in_all = false;
       }
+    else
+      {
+      break;
+      }
     }
 
   if (s == args.end())

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.137.2.11
retrieving revision 1.137.2.12
diff -u -d -r1.137.2.11 -r1.137.2.12
--- cmGlobalGenerator.cxx	16 Mar 2007 22:05:42 -0000	1.137.2.11
+++ cmGlobalGenerator.cxx	1 Jun 2007 15:18:49 -0000	1.137.2.12
@@ -1346,7 +1346,7 @@
     if(cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.')
       {
       singleLine.push_back("-C");
-      singleLine.push_back(mf->GetDefinition("CMAKE_CFG_INTDIR"));
+      singleLine.push_back(cmakeCfgIntDir);
       }
     else // TODO: This is a hack. Should be something to do with the generator
       {