[Cmake-commits] CMake branch, next, updated. v3.0.2-5378-g09343af

[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  09343af43ca07b4f3210e21de92555e034801613 (commit)
       via  1b549a5c6494404f5cfd3d1d113f0b56a22c78f0 (commit)
      from  d0972b0bd0b43181a0da50f045023f4bf5cc8b48 (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=09343af43ca07b4f3210e21de92555e034801613
commit 09343af43ca07b4f3210e21de92555e034801613
Merge: d0972b0 1b549a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 18 09:27:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 18 09:27:51 2014 -0400

    Merge topic 'fix-enable_language-missing-module-errors' into next
    
    1b549a5c enable_language: Fix error messages on missing modules (#15155)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b549a5c6494404f5cfd3d1d113f0b56a22c78f0
commit 1b549a5c6494404f5cfd3d1d113f0b56a22c78f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 18 09:25:26 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 18 09:25:26 2014 -0400

    enable_language: Fix error messages on missing modules (#15155)
    
    In cmGlobalGenerator::EnableLanguage, fix error messages for missing
    module files to actually name the missing module instead of using the
    empty string returned by GetModulesFile.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4375114..6a4adc0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -506,8 +506,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
     fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake");
     if(!mf->ReadListFile(0,fpath.c_str()))
       {
-      cmSystemTools::Error("Could not find cmake module file: ",
-                           fpath.c_str());
+      cmSystemTools::Error("Could not find cmake module file: "
+                           "CMakeSystemSpecificInitialize.cmake");
       }
     }
 
@@ -575,7 +575,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
       if(!mf->ReadListFile(0,determineFile.c_str()))
         {
         cmSystemTools::Error("Could not find cmake module file: ",
-                             determineFile.c_str());
+                             determineCompiler.c_str());
         }
       needTestLanguage[lang] = true;
       // Some generators like visual studio should not use the env variables
@@ -627,8 +627,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
     fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake");
     if(!mf->ReadListFile(0,fpath.c_str()))
       {
-      cmSystemTools::Error("Could not find cmake module file: ",
-                           fpath.c_str());
+      cmSystemTools::Error("Could not find cmake module file: "
+                           "CMakeSystemSpecificInformation.cmake");
       }
     }
   // loop over languages again loading CMake(LANG)Information.cmake
@@ -744,7 +744,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
         if(!mf->ReadListFile(0,ifpath.c_str()))
           {
           cmSystemTools::Error("Could not find cmake module file: ",
-                               ifpath.c_str());
+                               testLang.c_str());
           }
         std::string compilerWorks = "CMAKE_";
         compilerWorks += lang;

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake