[Cmake-commits] CMake branch, next, updated. v3.0.0-4492-ga790821

[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  a79082165eb56ae51dddb7d9a68b45fd9dea1184 (commit)
       via  051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af (commit)
      from  807661bce77368f303b4b5b95f41fd2c4e3131f2 (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=a79082165eb56ae51dddb7d9a68b45fd9dea1184
commit a79082165eb56ae51dddb7d9a68b45fd9dea1184
Merge: 807661b 051fb2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 24 12:48:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 24 12:48:28 2014 -0400

    Merge topic 'fix-broken-re-cmake' into next
    
    051fb2e2 Revert "cmake: Avoid overwriting compiler name if specified repeatedly."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af
commit 051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 24 12:49:33 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 24 12:49:33 2014 -0400

    Revert "cmake: Avoid overwriting compiler name if specified repeatedly."
    
    This reverts commit a12e4e782c9c8d290071a3fb8f8abcf5cba24afe.
    We will use another approach to resolve this problem.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3e4ae17..a051c87 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -355,36 +355,6 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
             }
           }
 
-        cmsys::RegularExpression compilerRex("^CMAKE_[a-zA-Z]+_COMPILER$");
-        if (compilerRex.find(var))
-          {
-          std::string newVal = cmSystemTools::FindProgram(value.c_str());
-          const char* existing =
-                          this->CacheManager->GetCacheValue(var.c_str());
-          if (existing && existing == newVal)
-            {
-            // Repeated invocation of cmake with arguments specifying a
-            // compiler, such as -DCMAKE_CXX_COMPILER=clang++, should not
-            // re-populate the cache with the un-resolved name.  On the
-            // first run of cmake, the CMakeDetermineCXXCompiler.cmake logic
-            // is executed and the result is resolved to a full path and
-            // cached,  On subsequent runs of cmake, we wish to avoid
-            // re-executing the CMakeDetermineCXXCompiler.cmake logic.
-            // The cmGlobalGenerator::ResolveLanguageCompiler method is
-            // responsible for ensuring that the cache is deleted if the
-            // value in the cache is changed.
-            // A scripting environment can invoke cmake on the command line
-            // with arguments specifying the compiler in a way which is
-            // intended to give reproducible results.  Ignore the value
-            // specified on the command line if it results in the same
-            // value as is already in the cache.  Otherwise,
-            // cmMakefile::AddCacheDefinition would use CollapseFullPath on
-            // the entry, incorrectly resolving 'clang++' to
-            // '<CMAKE_BUILD_DIR>/clang++', which is unlikely to exist.
-            continue;
-            }
-          }
-
         this->CacheManager->AddCacheEntry(var, value.c_str(),
           "No help, variable specified on the command line.", type);
 

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

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


hooks/post-receive
-- 
CMake