[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3931-ge4ad585

[Stephen Kelly]

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  e4ad5858b032d5347eb7755a4b887ae880559ea9 (commit)
       via  8b2a2db0735a836c6ebe40458b9a95ac08e61ea9 (commit)
       via  79af005cf8d58575315916c24d8cd518065ab3c2 (commit)
       via  10ad7e458c5eaffb090068a62cf6c4d1eb2df6a6 (commit)
       via  31719643c5ae54c063a50938a467f3cfc8e0d7df (commit)
      from  b54cf865cd1af98c095fb28387869e3a14340e60 (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=e4ad5858b032d5347eb7755a4b887ae880559ea9
commit e4ad5858b032d5347eb7755a4b887ae880559ea9
Merge: b54cf86 8b2a2db
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 19 08:36:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 19 08:36:02 2013 -0400

    Merge topic 'fix-reset-compiler' into next
    
    8b2a2db Fix resetting the compiler on the command line (#14366).
    79af005 CMake Nightly Date Stamp
    10ad7e4 CMake Nightly Date Stamp
    3171964 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b2a2db0735a836c6ebe40458b9a95ac08e61ea9
commit 8b2a2db0735a836c6ebe40458b9a95ac08e61ea9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 19 14:12:56 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 19 14:35:14 2013 +0200

    Fix resetting the compiler on the command line (#14366).
    
    Convert the incoming value to a path in the same way that the
    already-cached value was converted before comparison.
    
    Do the actual comparison only one time, after both values are
    normalized.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7f2b592..799bbdb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -146,9 +146,17 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string &lang,
   const char* cname = this->GetCMakeInstance()->
     GetCacheManager()->GetCacheValue(langComp.c_str());
   std::string changeVars;
-  if(cname && (path != cname) && (optional==false))
+  if(cname && !optional)
     {
-    std::string cnameString = cname;
+    std::string cnameString;
+    if(!cmSystemTools::FileIsFullPath(cname))
+      {
+      cnameString = cmSystemTools::FindProgram(cname);
+      }
+    else
+      {
+      cnameString = cname;
+      }
     std::string pathString = path;
     // get rid of potentially multiple slashes:
     cmSystemTools::ConvertToUnixSlashes(cnameString);

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

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/cmGlobalGenerator.cxx |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake