[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-732-g5fdda16

[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  5fdda16a1b39d00ab50581ef14430188e0cebe85 (commit)
       via  327490e698db7a74f6a8e8543e99c6c7c9333a8f (commit)
      from  e2360a21863e56dd789e6faa4d61f3d06c15efa5 (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=5fdda16a1b39d00ab50581ef14430188e0cebe85
commit 5fdda16a1b39d00ab50581ef14430188e0cebe85
Merge: e2360a2 327490e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 29 16:18:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 29 16:18:39 2015 -0400

    Merge topic 'enable_language-fail-earlier' into next
    
    327490e6 enable_language: Allow CMakeDetermine<LANG>Compiler module to fail early


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=327490e698db7a74f6a8e8543e99c6c7c9333a8f
commit 327490e698db7a74f6a8e8543e99c6c7c9333a8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 29 14:51:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 29 16:18:32 2015 -0400

    enable_language: Allow CMakeDetermine<LANG>Compiler module to fail early
    
    If the module reports a FATAL_ERROR, skip the rest of the steps to
    enable the language to avoid unnecessary following error messages.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 14eaeac..23ab93d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -564,6 +564,10 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
         cmSystemTools::Error("Could not find cmake module file: ",
                              determineCompiler.c_str());
         }
+      if (cmSystemTools::GetFatalErrorOccured())
+        {
+        return;
+        }
       needTestLanguage[lang] = true;
       // Some generators like visual studio should not use the env variables
       // So the global generator can specify that in this variable
diff --git a/Tests/RunCMake/Languages/DetermineFail-result.txt b/Tests/RunCMake/Languages/DetermineFail-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Languages/DetermineFail-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Languages/DetermineFail-stderr.txt b/Tests/RunCMake/Languages/DetermineFail-stderr.txt
new file mode 100644
index 0000000..3b4743e
--- /dev/null
+++ b/Tests/RunCMake/Languages/DetermineFail-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Error at Modules/CMakeDetermineFailCompiler.cmake:[0-9]+ \(message\):
+  This language is not supported.
+Call Stack \(most recent call first\):
+  DetermineFail.cmake:[0-9]+ \(enable_language\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/Languages/DetermineFail.cmake b/Tests/RunCMake/Languages/DetermineFail.cmake
new file mode 100644
index 0000000..3c8d17d
--- /dev/null
+++ b/Tests/RunCMake/Languages/DetermineFail.cmake
@@ -0,0 +1,2 @@
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
+enable_language(Fail)
diff --git a/Tests/RunCMake/Languages/Modules/CMakeDetermineFailCompiler.cmake b/Tests/RunCMake/Languages/Modules/CMakeDetermineFailCompiler.cmake
new file mode 100644
index 0000000..3b2d50a
--- /dev/null
+++ b/Tests/RunCMake/Languages/Modules/CMakeDetermineFailCompiler.cmake
@@ -0,0 +1 @@
+message(FATAL_ERROR "This language is not supported.")
diff --git a/Tests/RunCMake/Languages/RunCMakeTest.cmake b/Tests/RunCMake/Languages/RunCMakeTest.cmake
index 6517a81..732baae 100644
--- a/Tests/RunCMake/Languages/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Languages/RunCMakeTest.cmake
@@ -4,3 +4,5 @@ run_cmake(NoLangSHARED)
 run_cmake(LINK_LANGUAGE-genex)
 run_cmake(link-libraries-TARGET_FILE-genex)
 run_cmake(link-libraries-TARGET_FILE-genex-ok)
+
+run_cmake(DetermineFail)

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

Summary of changes:


hooks/post-receive
-- 
CMake