[Cmake-commits] [cmake-commits] hoffman committed cmMakefile.cxx 1.486 1.487 cmMakefile.h 1.237 1.238 cmSetCommand.cxx 1.33 1.34

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx cmMakefile.h cmSetCommand.cxx 
Log Message:
BUG: fix issue with -D and cache force


Index: cmSetCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSetCommand.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -C 2 -d -r1.33 -r1.34
*** cmSetCommand.cxx	13 Mar 2008 17:52:49 -0000	1.33
--- cmSetCommand.cxx	21 Nov 2008 21:32:39 -0000	1.34
***************
*** 172,176 ****
                                     value.c_str(),
                                     docstring,
!                                    type);
      }
    else
--- 172,176 ----
                                     value.c_str(),
                                     docstring,
!                                    type, force);
      }
    else

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.237
retrieving revision 1.238
diff -C 2 -d -r1.237 -r1.238
*** cmMakefile.h	9 Oct 2008 15:00:54 -0000	1.237
--- cmMakefile.h	21 Nov 2008 21:32:39 -0000	1.238
***************
*** 265,269 ****
    void AddCacheDefinition(const char* name, const char* value, 
                            const char* doc,
!                           cmCacheManager::CacheEntryType type);
  
    /**
--- 265,270 ----
    void AddCacheDefinition(const char* name, const char* value, 
                            const char* doc,
!                           cmCacheManager::CacheEntryType type,
!                           bool force = false);
  
    /**

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.486
retrieving revision 1.487
diff -C 2 -d -r1.486 -r1.487
*** cmMakefile.cxx	9 Oct 2008 17:52:25 -0000	1.486
--- cmMakefile.cxx	21 Nov 2008 21:32:39 -0000	1.487
***************
*** 1562,1566 ****
  void cmMakefile::AddCacheDefinition(const char* name, const char* value,
                                      const char* doc,
!                                     cmCacheManager::CacheEntryType type)
  {
    const char* val = value;
--- 1562,1567 ----
  void cmMakefile::AddCacheDefinition(const char* name, const char* value,
                                      const char* doc,
!                                     cmCacheManager::CacheEntryType type,
!                                     bool force)
  {
    const char* val = value;
***************
*** 1570,1574 ****
       it.Initialized())
      {
!     val = it.GetValue();
      if ( type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH )
        {
--- 1571,1580 ----
       it.Initialized())
      {
!     // if this is not a force, then use the value from the cache
!     // if it is a force, then use the value being passed in
!     if(!force)
!       {
!       val = it.GetValue();
!       }
      if ( type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH )
        {