[cmake-commits] king committed cmGlobalWatcomWMakeGenerator.cxx 1.9
1.10 cmLocalGenerator.cxx 1.162 1.163 cmLocalGenerator.h 1.69
1.70 cmLocalUnixMakefileGenerator3.h 1.63 1.64
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 25 11:23:06 EDT 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13972
Modified Files:
cmGlobalWatcomWMakeGenerator.cxx cmLocalGenerator.cxx
cmLocalGenerator.h cmLocalUnixMakefileGenerator3.h
Log Message:
ENH: Adding support for # escape in Watcom WMake.
Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cmLocalUnixMakefileGenerator3.h 13 Oct 2006 14:22:45 -0000 1.63
+++ cmLocalUnixMakefileGenerator3.h 25 Oct 2006 15:23:03 -0000 1.64
@@ -105,6 +105,11 @@
void SetWindowsShell(bool v) {this->WindowsShell = v;}
/**
+ * Set to true if the make tool being used is Watcom WMake.
+ */
+ void SetWatcomWMake(bool v) {this->WatcomWMake = v;}
+
+ /**
* Set to true if the shell being used is the MSYS shell.
* This controls if statements in the makefile and the SHELL variable.
* The default is false.
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- cmLocalGenerator.cxx 16 Oct 2006 22:17:14 -0000 1.162
+++ cmLocalGenerator.cxx 25 Oct 2006 15:23:03 -0000 1.163
@@ -40,6 +40,7 @@
this->Parent = 0;
this->WindowsShell = false;
this->WindowsVSIDE = false;
+ this->WatcomWMake = false;
this->MSYSShell = false;
this->IgnoreLibPrefix = false;
this->UseRelativePaths = false;
@@ -2348,6 +2349,10 @@
{
flags |= cmsysSystem_Shell_Flag_EchoWindows;
}
+ if(this->WatcomWMake)
+ {
+ flags |= cmsysSystem_Shell_Flag_WatcomWMake;
+ }
// Compute the buffer size needed.
int size = (this->WindowsShell ?
Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- cmLocalGenerator.h 16 Oct 2006 22:17:14 -0000 1.69
+++ cmLocalGenerator.h 25 Oct 2006 15:23:03 -0000 1.70
@@ -278,6 +278,7 @@
std::map<cmStdString, cmStdString> UniqueObjectNamesMap;
bool WindowsShell;
bool WindowsVSIDE;
+ bool WatcomWMake;
bool ForceUnixPath;
bool MSYSShell;
bool UseRelativePaths;
Index: cmGlobalWatcomWMakeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalWatcomWMakeGenerator.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmGlobalWatcomWMakeGenerator.cxx 4 Oct 2006 22:52:28 -0000 1.9
+++ cmGlobalWatcomWMakeGenerator.cxx 25 Oct 2006 15:23:03 -0000 1.10
@@ -50,6 +50,7 @@
lg->SetSilentNoColon(true);
lg->SetDefineWindowsNULL(true);
lg->SetWindowsShell(true);
+ lg->SetWatcomWMake(true);
lg->SetMakeSilentFlag("-s -h");
lg->SetGlobalGenerator(this);
lg->SetIgnoreLibPrefix(true);
More information about the Cmake-commits
mailing list