[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-896-g6e60ff5

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6e60ff567461859f22b5e81003fe4dd2d6cabf5e (commit)
       via  3b60232ebcde69789a6c26f5c523ad107a7099c5 (commit)
      from  c0e109d9bdbadc882abb8c10ae91c202f09e5fe2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e60ff567461859f22b5e81003fe4dd2d6cabf5e
commit 6e60ff567461859f22b5e81003fe4dd2d6cabf5e
Merge: c0e109d 3b60232
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 7 14:21:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 7 14:21:12 2015 -0400

    Merge topic 'preserve-generator-on-failure' into next
    
    3b60232e cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b60232ebcde69789a6c26f5c523ad107a7099c5
commit 3b60232ebcde69789a6c26f5c523ad107a7099c5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 7 14:12:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 7 14:12:38 2015 -0400

    cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
    
    Since commit v2.4.0~4158 (When the initially configured generator is
    invalid, allow the user to change the generator without deleting the cache
    by hand, 2003-05-13) we remove CMAKE_GENERATOR from the cache if an error
    occurs and CMAKE_MAKE_PROGRAM is not cached.  This worked at the time
    because all generators initialized the CMAKE_MAKE_PROGRAM cache entry.
    Since commit v3.0.0-rc1~260^2~4 (VS: Switch to internal CMAKE_MAKE_PROGRAM
    lookup by generators, 2013-11-15) and commit v3.2.0-rc1~39^2 (Xcode:
    Switch to internal CMAKE_MAKE_PROGRAM lookup by generator, 2015-01-28) the
    VS and Xcode generators no longer store CMAKE_MAKE_PROGRAM in the cache.
    Therefore any error during generation would wipe out CMAKE_GENERATOR from
    the cache and cause the next configuration to choose a default generator.
    
    Simply drop the behavior introduced by the original commit and always
    preserve CMAKE_GENERATOR.  Since the time that behavior was introduced a
    lot more state is now saved in CMakeCache.txt and CMakeFiles/ during the
    initial configuration so it is not safe to change generators without
    starting fresh anyway.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 0570399..7bf3832 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1439,19 +1439,6 @@ int cmake::ActualConfigure()
       }
     }
 
-  if(cmSystemTools::GetFatalErrorOccured())
-    {
-    const char* makeProgram =
-        this->State->GetInitializedCacheValue("CMAKE_MAKE_PROGRAM");
-    if (!makeProgram || cmSystemTools::IsOff(makeProgram))
-      {
-      // We must have a bad generator selection.  Wipe the cache entry so the
-      // user can select another.
-      this->State->RemoveCacheEntry("CMAKE_GENERATOR");
-      this->State->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR");
-      }
-    }
-
   cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
   if (mf->IsOn("CTEST_USE_LAUNCHERS")
               && !this->State->GetGlobalProperty("RULE_LAUNCH_COMPILE"))

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx |   13 -------------
 1 file changed, 13 deletions(-)


hooks/post-receive
-- 
CMake