[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3287-gd1cfc53

[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  d1cfc53414307c7c8988a1bee606326f63c17325 (commit)
       via  eb86a4dea1c2ed6947370d3091856bcd80f96658 (commit)
      from  468db776c810c91a89ec22bd966b4946e369d7ff (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=d1cfc53414307c7c8988a1bee606326f63c17325
commit d1cfc53414307c7c8988a1bee606326f63c17325
Merge: 468db77 eb86a4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 21 11:13:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 21 11:13:08 2014 -0400

    Merge topic 'COMPILE_FEATURES-genex' into next
    
    eb86a4de Fix test condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb86a4dea1c2ed6947370d3091856bcd80f96658
commit eb86a4dea1c2ed6947370d3091856bcd80f96658
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 21 17:12:43 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 21 17:12:43 2014 +0200

    Fix test condition.

diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 7acd926..1892a5c 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -29,14 +29,14 @@ if (NOT CXX_FEATURES)
 else()
   run_cmake(LinkImplementationFeatureCycle)
   run_cmake(LinkImplementationFeatureCycleSolved)
-endif()
 
-if (";${CXX_FEATURES};" MATCHES ";cxx_final;")
-  set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1")
+  if (";${CXX_FEATURES};" MATCHES ";cxx_final;")
+    set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1")
+  endif()
+  run_cmake(NonValidTarget1)
+  run_cmake(NonValidTarget2)
+  unset(RunCMake_TEST_OPTIONS)
 endif()
-run_cmake(NonValidTarget1)
-run_cmake(NonValidTarget2)
-unset(RunCMake_TEST_OPTIONS)
 
 foreach(standard 98 11)
   file(READ

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

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


hooks/post-receive
-- 
CMake