[cmake-commits] hoffman committed cmLocalVisualStudio7Generator.cxx
1.195 1.196
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jul 31 11:23:17 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6595/Source
Modified Files:
cmLocalVisualStudio7Generator.cxx
Log Message:
BUG: fix DLL and DEF being lost and add real support for /DEF: /DLL does not have an entry so just let it pass to advanced command line
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- cmLocalVisualStudio7Generator.cxx 18 Jun 2007 15:59:23 -0000 1.195
+++ cmLocalVisualStudio7Generator.cxx 31 Jul 2007 15:23:15 -0000 1.196
@@ -346,6 +346,8 @@
cmVS7FlagTable::UserValue},
{"IgnoreAllDefaultLibraries", "NODEFAULTLIB", "ignore all default libs",
"TRUE", 0},
+ {"ModuleDefinitionFile", "DEF:", "add an export def file", "",
+ cmVS7FlagTable::UserValue},
{0,0,0,0,0}
};
@@ -1726,7 +1728,8 @@
if(flag[0] == '-' || flag[0] == '/')
{
// Look for preprocessor definitions.
- if(flag[1] == 'D')
+ if(flag[1] == 'D' && strncmp(flag+1, "DEF:", 4) !=0
+ && strcmp(flag+1, "DLL") != 0)
{
if(flag[2] == '\0')
{
@@ -1760,7 +1763,6 @@
return;
}
}
-
// This option is not known. Store it in the output flags.
this->FlagString += " ";
this->FlagString +=
@@ -1901,6 +1903,5 @@
dir += this->GetTargetDirectory(*target);
dir += "/";
dir += this->GetGlobalGenerator()->GetCMakeCFGInitDirectory();
- std::cerr << dir << "\n";
dirs.push_back(dir);
}
More information about the Cmake-commits
mailing list