[Cmake-commits] [cmake-commits] hoffman committed cmake.h 1.109 1.110 cmake.cxx 1.376 1.377

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.h cmake.cxx 
Log Message:
ENH: make sure -Wno-dev sticks so make rebuild_cache will work


Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -C 2 -d -r1.109 -r1.110
*** cmake.h	13 Mar 2008 17:48:57 -0000	1.109
--- cmake.h	22 Mar 2008 14:24:05 -0000	1.110
***************
*** 389,392 ****
--- 389,393 ----
    std::string StartOutputDirectory;
    bool SuppressDevWarnings;
+   bool DoSuppressDevWarnings;
    std::set<cmStdString> WrittenFiles;
  

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.376
retrieving revision 1.377
diff -C 2 -d -r1.376 -r1.377
*** cmake.cxx	20 Mar 2008 14:11:52 -0000	1.376
--- cmake.cxx	22 Mar 2008 14:24:06 -0000	1.377
***************
*** 142,145 ****
--- 142,146 ----
  {
    this->SuppressDevWarnings = false;
+   this->DoSuppressDevWarnings = false;
    this->DebugOutput = false;
    this->DebugTryCompile = false;
***************
*** 388,395 ****
        {
        this->SuppressDevWarnings = true;
        }
      else if(arg.find("-Wdev",0) == 0)
!       {
        this->SuppressDevWarnings = false;
        }
      else if(arg.find("-U",0) == 0)
--- 389,398 ----
        {
        this->SuppressDevWarnings = true;
+       this->DoSuppressDevWarnings = true;
        }
      else if(arg.find("-Wdev",0) == 0)
!       { 
        this->SuppressDevWarnings = false;
+       this->DoSuppressDevWarnings = true;
        }
      else if(arg.find("-U",0) == 0)
***************
*** 1897,1917 ****
  int cmake::Configure()
  {
!   if(this->SuppressDevWarnings)
!     {
!     this->CacheManager->
!       AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "TRUE",
!                     "Suppress Warnings that are meant for"
!                     " the author of the CMakeLists.txt files.",
!                     cmCacheManager::INTERNAL);
!     }
!   else
      {
!     this->CacheManager->
!       AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "FALSE",
!                     "Suppress Warnings that are meant for"
!                     " the author of the CMakeLists.txt files.",
!                     cmCacheManager::INTERNAL);
      }
- 
    int ret = this->ActualConfigure();
    const char* delCacheVars =
--- 1900,1922 ----
  int cmake::Configure()
  {
!   if(this->DoSuppressDevWarnings)
      {
!     if(this->SuppressDevWarnings)
!       {
!       this->CacheManager->
!         AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "TRUE",
!                       "Suppress Warnings that are meant for"
!                       " the author of the CMakeLists.txt files.",
!                       cmCacheManager::INTERNAL);
!       }
!     else
!       {
!       this->CacheManager->
!         AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "FALSE",
!                       "Suppress Warnings that are meant for"
!                       " the author of the CMakeLists.txt files.",
!                       cmCacheManager::INTERNAL);
!       }
      }
    int ret = this->ActualConfigure();
    const char* delCacheVars =