Thu Jun 28 09:09:29 EDT 2007

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

Modified Files:
	cmGlobalBorlandMakefileGenerator.cxx 
	cmGlobalBorlandMakefileGenerator.h cmGlobalGenerator.cxx 
	cmGlobalGenerator.h cmGlobalMinGWMakefileGenerator.cxx 
	cmGlobalMinGWMakefileGenerator.h 
	cmGlobalMSYSMakefileGenerator.cxx 
	cmGlobalMSYSMakefileGenerator.h 
	cmGlobalNMakeMakefileGenerator.cxx 
	cmGlobalNMakeMakefileGenerator.h 
	cmGlobalUnixMakefileGenerator3.cxx 
	cmGlobalUnixMakefileGenerator3.h 
	cmGlobalVisualStudio6Generator.cxx 
	cmGlobalVisualStudio6Generator.h 
	cmGlobalVisualStudio7Generator.cxx 
	cmGlobalVisualStudio7Generator.h 
	cmGlobalVisualStudio8Win64Generator.cxx 
	cmGlobalVisualStudio8Win64Generator.h 
	cmGlobalWatcomWMakeGenerator.cxx 
	cmGlobalWatcomWMakeGenerator.h cmGlobalXCodeGenerator.cxx 
	cmGlobalXCodeGenerator.h cmLocalVisualStudio6Generator.cxx 
	cmMakefile.cxx cmMakefile.h cmProjectCommand.cxx 
	cmEnableLanguageCommand.cxx cmEnableLanguageCommand.h 
Log Message:

ENH: add OPTIONAL keyword to ENABLE_LANGUAGE, so it will be possible to do
something like this:

ENABLE_LANGUAGE(ASM-ATT)
IF(CMAKE_ASM-ATT_COMPILER_WORKS)
  ... do assembler stufff
ELSE(CMAKE_ASM-ATT_COMPILER_WORKS)
  ... fallback to generic C/C++
ENDIF(CMAKE_ASM-ATT_COMPILER_WORKS)

Alex


Index: cmGlobalMSYSMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMSYSMakefileGenerator.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- cmGlobalMSYSMakefileGenerator.cxx	3 Oct 2006 17:35:07 -0000	1.12
+++ cmGlobalMSYSMakefileGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.13
@@ -50,7 +50,9 @@
 }
 
 void cmGlobalMSYSMakefileGenerator
-::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& l, 
+                 cmMakefile *mf, 
+                 bool optional)
 {
   this->FindMakeProgram(mf);
   std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
@@ -75,7 +77,7 @@
   mf->AddDefinition("MSYS", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
   mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
-  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf);
+  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
   if(!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile())
     {
     cmSystemTools::Error

Index: cmGlobalMinGWMakefileGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMinGWMakefileGenerator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmGlobalMinGWMakefileGenerator.h	11 May 2006 14:39:55 -0000	1.3
+++ cmGlobalMinGWMakefileGenerator.h	28 Jun 2007 13:09:26 -0000	1.4
@@ -46,7 +46,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 };
 
 #endif

Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- cmGlobalGenerator.h	19 Jun 2007 17:10:21 -0000	1.84
+++ cmGlobalGenerator.h	28 Jun 2007 13:09:26 -0000	1.85
@@ -77,7 +77,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 
   /**
    * Try to determine system infomation, get it from another generator

Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- cmGlobalUnixMakefileGenerator3.cxx	5 Jun 2007 20:35:24 -0000	1.108
+++ cmGlobalUnixMakefileGenerator3.cxx	28 Jun 2007 13:09:26 -0000	1.109
@@ -39,9 +39,11 @@
 }
 
 void cmGlobalUnixMakefileGenerator3
-::EnableLanguage(std::vector<std::string>const& languages, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& languages, 
+                 cmMakefile *mf, 
+                 bool optional)
 {
-  this->cmGlobalGenerator::EnableLanguage(languages, mf);
+  this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
   std::string path;
   for(std::vector<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
@@ -70,7 +72,8 @@
       {
       path = name;
       }
-    if(path.size() == 0 || !cmSystemTools::FileExists(path.c_str()))
+    if((path.size() == 0 || !cmSystemTools::FileExists(path.c_str())) 
+        && (optional==false))
       {
       std::string message = "your ";
       message += lang;

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- cmGlobalGenerator.cxx	26 Jun 2007 23:54:00 -0000	1.191
+++ cmGlobalGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.192
@@ -196,7 +196,7 @@
 
 void
 cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
-                                  cmMakefile *mf)
+                                  cmMakefile *mf, bool optional)
 {
   if(languages.size() == 0)
     {

Index: cmProjectCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmProjectCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmProjectCommand.cxx	12 May 2006 17:44:15 -0000	1.23
+++ cmProjectCommand.cxx	28 Jun 2007 13:09:26 -0000	1.24
@@ -72,7 +72,7 @@
     languages.push_back("C");
     languages.push_back("CXX");
     }
-  this->Makefile->EnableLanguage(languages);
+  this->Makefile->EnableLanguage(languages, false);
   return true;
 }
 

Index: cmGlobalXCodeGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- cmGlobalXCodeGenerator.h	24 May 2007 21:06:32 -0000	1.49
+++ cmGlobalXCodeGenerator.h	28 Jun 2007 13:09:26 -0000	1.50
@@ -53,7 +53,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages, 
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
   /**
    * Try running cmake and building a file. This is used for dynalically
    * loaded commands, not as part of the usual build process.

Index: cmGlobalWatcomWMakeGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalWatcomWMakeGenerator.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmGlobalWatcomWMakeGenerator.h	10 Mar 2006 18:54:57 -0000	1.2
+++ cmGlobalWatcomWMakeGenerator.h	28 Jun 2007 13:09:26 -0000	1.3
@@ -45,7 +45,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages, 
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 };
 
 #endif

Index: cmGlobalMinGWMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMinGWMakefileGenerator.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmGlobalMinGWMakefileGenerator.cxx	17 May 2007 14:53:17 -0000	1.10
+++ cmGlobalMinGWMakefileGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.11
@@ -27,7 +27,9 @@
 }
 
 void cmGlobalMinGWMakefileGenerator
-::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& l, 
+                 cmMakefile *mf, 
+                 bool optional)
 { 
   this->FindMakeProgram(mf);
   std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
@@ -49,7 +51,7 @@
     }
   mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
   mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
-  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf);
+  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
 }
 
 ///! Create a local generator appropriate to this Global Generator

Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- cmGlobalXCodeGenerator.cxx	18 Jun 2007 15:59:23 -0000	1.160
+++ cmGlobalXCodeGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.161
@@ -104,7 +104,7 @@
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
                                             lang,
-                                            cmMakefile * mf)
+                                            cmMakefile * mf, bool optional)
 { 
   mf->AddDefinition("XCODE","1");
   if(this->XcodeVersion == 15)
@@ -125,7 +125,7 @@
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
   // initialize Architectures so it can be used by 
   //  GetTargetObjectFileDirectories
-  this->cmGlobalGenerator::EnableLanguage(lang, mf);
+  this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
     const char* osxArch = 
       mf->GetDefinition("CMAKE_OSX_ARCHITECTURES");
   const char* sysroot = 

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- cmLocalVisualStudio6Generator.cxx	18 Jun 2007 15:59:23 -0000	1.128
+++ cmLocalVisualStudio6Generator.cxx	28 Jun 2007 13:09:26 -0000	1.129
@@ -1044,7 +1044,7 @@
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmTarget* tgt = this->GlobalGenerator->FindTarget(0, j->first.c_str(), 
+      cmTarget* tgt = this->GlobalGenerator->FindTarget(0, j->first.c_str(),
                                                         false);
       if(tgt)
         {

Index: cmGlobalVisualStudio8Win64Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Win64Generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmGlobalVisualStudio8Win64Generator.cxx	12 Mar 2007 16:35:11 -0000	1.3
+++ cmGlobalVisualStudio8Win64Generator.cxx	28 Jun 2007 13:09:26 -0000	1.4
@@ -49,8 +49,8 @@
 
 void cmGlobalVisualStudio8Win64Generator
 ::EnableLanguage(std::vector<std::string>const &  lang, 
-                 cmMakefile *mf)
+                 cmMakefile *mf, bool optional)
 {
   mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
-  cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf);
+  cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
 }

Index: cmGlobalVisualStudio8Win64Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Win64Generator.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmGlobalVisualStudio8Win64Generator.h	11 May 2006 15:47:03 -0000	1.2
+++ cmGlobalVisualStudio8Win64Generator.h	28 Jun 2007 13:09:26 -0000	1.3
@@ -49,6 +49,6 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages, 
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 };
 #endif

Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cmGlobalVisualStudio7Generator.h	4 Apr 2007 15:22:14 -0000	1.42
+++ cmGlobalVisualStudio7Generator.h	28 Jun 2007 13:09:26 -0000	1.43
@@ -50,7 +50,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages, 
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 
   /**
    * Try running cmake and building a file. This is used for dynalically

Index: cmGlobalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.cxx,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cmGlobalVisualStudio6Generator.cxx	23 May 2007 19:40:12 -0000	1.71
+++ cmGlobalVisualStudio6Generator.cxx	28 Jun 2007 13:09:26 -0000	1.72
@@ -25,7 +25,9 @@
 }
 
 void cmGlobalVisualStudio6Generator
-::EnableLanguage(std::vector<std::string>const& lang, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& lang, 
+                 cmMakefile *mf, 
+                 bool options)
 {
   mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
@@ -34,7 +36,7 @@
   mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort");
   mf->AddDefinition("MSVC60", "1");
   this->GenerateConfigurations(mf);
-  this->cmGlobalGenerator::EnableLanguage(lang, mf);
+  this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
 }
 
 void cmGlobalVisualStudio6Generator::GenerateConfigurations(cmMakefile* mf)

Index: cmEnableLanguageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmEnableLanguageCommand.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmEnableLanguageCommand.cxx	10 May 2006 19:06:06 -0000	1.3
+++ cmEnableLanguageCommand.cxx	28 Jun 2007 13:09:26 -0000	1.4
@@ -20,13 +20,29 @@
 bool cmEnableLanguageCommand
 ::InitialPass(std::vector<std::string> const& args)
 {
+  bool optional = false;
+  std::vector<std::string> languages;
   if(args.size() < 1 )
     {
     this->SetError
       ("ENABLE_LANGUAGE called with incorrect number of arguments");
     return false;
     } 
-  this->Makefile->EnableLanguage(args);
+  for (std::vector<std::string>::const_iterator it = args.begin();
+       it != args.end();
+       ++it)
+    {
+    if ((*it) == "OPTIONAL")
+      {
+      optional = true;
+      }
+    else
+      {
+      languages.push_back(*it);
+      }
+    }
+
+  this->Makefile->EnableLanguage(languages, optional);
   return true;
 }
 

Index: cmEnableLanguageCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmEnableLanguageCommand.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmEnableLanguageCommand.h	24 Apr 2007 18:03:25 -0000	1.4
+++ cmEnableLanguageCommand.h	28 Jun 2007 13:09:26 -0000	1.5
@@ -63,11 +63,13 @@
   virtual const char* GetFullDocumentation()
     {
     return
-      "  ENABLE_LANGUAGE(languageName)\n"
+      "  ENABLE_LANGUAGE(languageName [OPTIONAL] )\n"
       "This command enables support for the named language in CMake. "
       "This is the same as the project command but does not create "
       "any of the extra varaibles that are created by the project command. "
-      "Example languages are CXX, C, Fortran.";
+      "Example languages are CXX, C, Fortran.\n"
+      "If OPTIONAL is used, use the CMAKE_<languageName>_COMPILER_WORKS "
+      "variable to check whether the language has been enabled successfully.";
     }
   
   cmTypeMacro(cmEnableLanguageCommand, cmCommand);

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- cmMakefile.cxx	25 Jun 2007 13:51:37 -0000	1.400
+++ cmMakefile.cxx	28 Jun 2007 13:09:26 -0000	1.401
@@ -2150,11 +2150,13 @@
     }
 }
 
-void cmMakefile::EnableLanguage(std::vector<std::string> const &  lang)
+void cmMakefile::EnableLanguage(std::vector<std::string> const &  lang, 
+                               bool optional)
 {
   this->AddDefinition("CMAKE_CFG_INTDIR",
-    this->LocalGenerator->GetGlobalGenerator()->GetCMakeCFGInitDirectory());
-  this->LocalGenerator->GetGlobalGenerator()->EnableLanguage(lang, this);
+  this->LocalGenerator->GetGlobalGenerator()->GetCMakeCFGInitDirectory());
+  this->LocalGenerator->GetGlobalGenerator()->EnableLanguage(lang, this, 
+                                                             optional);
 }
 
 void cmMakefile::ExpandSourceListArguments(

Index: cmGlobalBorlandMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalBorlandMakefileGenerator.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cmGlobalBorlandMakefileGenerator.cxx	17 May 2007 14:53:17 -0000	1.26
+++ cmGlobalBorlandMakefileGenerator.cxx	28 Jun 2007 13:09:25 -0000	1.27
@@ -30,13 +30,15 @@
 
 
 void cmGlobalBorlandMakefileGenerator
-::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& l, 
+                 cmMakefile *mf, 
+                 bool optional)
 {
   std::string outdir = this->CMakeInstance->GetStartOutputDirectory();
   mf->AddDefinition("BORLAND", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); 
-  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf);
+  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
 }
 
 ///! Create a local generator appropriate to this Global Generator

Index: cmGlobalMSYSMakefileGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMSYSMakefileGenerator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmGlobalMSYSMakefileGenerator.h	12 May 2006 14:46:50 -0000	1.4
+++ cmGlobalMSYSMakefileGenerator.h	28 Jun 2007 13:09:26 -0000	1.5
@@ -47,7 +47,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 
 private:
   std::string FindMinGW(std::string const& makeloc);

Index: cmGlobalWatcomWMakeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalWatcomWMakeGenerator.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cmGlobalWatcomWMakeGenerator.cxx	16 May 2007 17:24:17 -0000	1.12
+++ cmGlobalWatcomWMakeGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.13
@@ -28,7 +28,9 @@
 }
 
 void cmGlobalWatcomWMakeGenerator
-::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& l, 
+                 cmMakefile *mf, 
+                 bool optional)
 {
   // pick a default 
   mf->AddDefinition("WATCOM", "1");
@@ -39,7 +41,7 @@
   mf->AddDefinition("CMAKE_NO_QUOTED_OBJECTS", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "wcl386");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "wcl386");
-  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf);
+  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
 }
 
 ///! Create a local generator appropriate to this Global Generator

Index: cmGlobalVisualStudio6Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmGlobalVisualStudio6Generator.h	4 Apr 2007 15:22:14 -0000	1.28
+++ cmGlobalVisualStudio6Generator.h	28 Jun 2007 13:09:26 -0000	1.29
@@ -49,7 +49,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages, 
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 
   /**
    * Try running cmake and building a file. This is used for dynalically

Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- cmGlobalVisualStudio7Generator.cxx	23 May 2007 19:40:12 -0000	1.89
+++ cmGlobalVisualStudio7Generator.cxx	28 Jun 2007 13:09:26 -0000	1.90
@@ -29,7 +29,7 @@
 
 void cmGlobalVisualStudio7Generator
 ::EnableLanguage(std::vector<std::string>const &  lang, 
-                 cmMakefile *mf)
+                 cmMakefile *mf, bool optional)
 {
   mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
@@ -40,7 +40,7 @@
   this->AddPlatformDefinitions(mf);
   
   // Create list of configurations requested by user's cache, if any.
-  this->cmGlobalGenerator::EnableLanguage(lang, mf);
+  this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
   this->GenerateConfigurations(mf);
   
   // if this environment variable is set, then copy it to

Index: cmGlobalNMakeMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalNMakeMakefileGenerator.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmGlobalNMakeMakefileGenerator.cxx	4 Oct 2006 22:52:28 -0000	1.23
+++ cmGlobalNMakeMakefileGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.24
@@ -27,12 +27,14 @@
 }
 
 void cmGlobalNMakeMakefileGenerator
-::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& l, 
+                 cmMakefile *mf, 
+                 bool optional)
 {
   // pick a default 
   mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
-  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf);
+  this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
 }
 
 ///! Create a local generator appropriate to this Global Generator

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- cmMakefile.h	22 Jun 2007 13:58:10 -0000	1.211
+++ cmMakefile.h	28 Jun 2007 13:09:26 -0000	1.212
@@ -633,7 +633,7 @@
 
   ///! Enable support for named language, if nil then all languages are
   ///enabled.
-  void EnableLanguage(std::vector<std::string>const& languages);
+  void EnableLanguage(std::vector<std::string>const& languages, bool optional);
 
   /**
    * Set/Get the name of the parent directories CMakeLists file

Index: cmGlobalNMakeMakefileGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalNMakeMakefileGenerator.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cmGlobalNMakeMakefileGenerator.h	11 May 2006 14:39:55 -0000	1.11
+++ cmGlobalNMakeMakefileGenerator.h	28 Jun 2007 13:09:26 -0000	1.12
@@ -46,7 +46,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 };
 
 #endif

Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cmGlobalUnixMakefileGenerator3.h	5 Jun 2007 20:37:27 -0000	1.43
+++ cmGlobalUnixMakefileGenerator3.h	28 Jun 2007 13:09:26 -0000	1.44
@@ -77,7 +77,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 
   /**
    * Generate the all required files for building this project/tree. This

Index: cmGlobalBorlandMakefileGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalBorlandMakefileGenerator.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmGlobalBorlandMakefileGenerator.h	10 Mar 2006 18:54:57 -0000	1.6
+++ cmGlobalBorlandMakefileGenerator.h	28 Jun 2007 13:09:26 -0000	1.7
@@ -47,7 +47,7 @@
    * extension, pthreads, byte order etc.  
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
-                              cmMakefile *);
+                              cmMakefile *, bool optional);
 };
 
 #endif

