[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-798-g284b149

[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  284b149f166f4a51e25a6ef32e234e9d88a4d005 (commit)
       via  4fb64da89dabb20fa5e1c7a7268c908d7f23481f (commit)
      from  1ef4199563c059e06d1911011b61a185f5a769ef (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=284b149f166f4a51e25a6ef32e234e9d88a4d005
commit 284b149f166f4a51e25a6ef32e234e9d88a4d005
Merge: 1ef4199 4fb64da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 28 12:14:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 28 12:14:29 2015 -0500

    Merge topic 'fix-crash-on-bad-LANG_STANDARD' into next
    
    4fb64da8 fixup! Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb64da89dabb20fa5e1c7a7268c908d7f23481f
commit 4fb64da89dabb20fa5e1c7a7268c908d7f23481f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 28 12:10:57 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 28 12:11:09 2015 -0500

    fixup! Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
    
    Run the test only if the compiler understands language standards.

diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 63cb4fa..c1b2227 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -8,8 +8,6 @@ run_cmake(NotAFeature_OriginDebugGenex)
 run_cmake(NotAFeature_OriginDebugTransitive)
 run_cmake(NotAFeature_OriginDebugCommand)
 
-run_cmake(NotAStandard)
-
 run_cmake(generate_feature_list)
 file(READ
   "${RunCMake_BINARY_DIR}/generate_feature_list-build/c_features.txt"
@@ -45,6 +43,8 @@ else()
 endif()
 
 if(CXX_STANDARD_DEFAULT)
+  run_cmake(NotAStandard)
+
   foreach(standard 98 11)
     file(READ
       "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx${standard}_flag.txt"

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake