[Cmake-commits] [cmake-commits] hoffman committed cmLocalVisualStudio6Generator.cxx 1.143 1.144

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Sep 9 13:04:32 EDT 2008


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

Modified Files:
	cmLocalVisualStudio6Generator.cxx 
Log Message:
BUG: fix empty /D option for vs6, fix for 7580


Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.143
retrieving revision 1.144
diff -C 2 -d -r1.143 -r1.144
*** cmLocalVisualStudio6Generator.cxx	16 May 2008 20:56:40 -0000	1.143
--- cmLocalVisualStudio6Generator.cxx	9 Sep 2008 17:04:30 -0000	1.144
***************
*** 1315,1318 ****
--- 1315,1325 ----
  
    std::string line;
+   std::string libnameExports;
+   if(exportSymbol.size())
+     {
+     libnameExports = "/D \"";
+     libnameExports += exportSymbol;
+     libnameExports += "\"";
+     }
    while(cmSystemTools::GetLineFromStream(fin, line))
      {
***************
*** 1323,1327 ****
        }
      cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME_EXPORTS",
!                                  exportSymbol.c_str());
      cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                   mfcFlag);
--- 1330,1334 ----
        }
      cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME_EXPORTS",
!                                  libnameExports.c_str());
      cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                   mfcFlag);



More information about the Cmake-commits mailing list