[Cmake-commits] CMake branch, next, updated. v3.1.0-2256-g4faa9d3

[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  4faa9d39ad49f942c231b60204d9834cf94256ca (commit)
       via  642dcc7d55072c1de996aa15d40d3673cb444331 (commit)
      from  28ca22320782278dc423d55a8c426122064ae1d5 (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=4faa9d39ad49f942c231b60204d9834cf94256ca
commit 4faa9d39ad49f942c231b60204d9834cf94256ca
Merge: 28ca223 642dcc7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 13:03:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 13:03:31 2015 -0500

    Merge topic 'feature-record-msvc' into next
    
    642dcc7d Fix RunCMake.CompileFeatures exclusion for MSVC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=642dcc7d55072c1de996aa15d40d3673cb444331
commit 642dcc7d55072c1de996aa15d40d3673cb444331
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 13:02:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 20 13:02:00 2015 -0500

    Fix RunCMake.CompileFeatures exclusion for MSVC
    
    The "MSVC" variable is not set inside the RunCMakeTest script.
    Check it when configuring the available tests and pass in a
    variable telling the test whether to exclude parts for MSVC.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 3a61751..3e2624e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -84,6 +84,9 @@ add_RunCMake_test(ObjectLibrary)
 add_RunCMake_test(TargetObjects)
 add_RunCMake_test(TargetSources)
 add_RunCMake_test(find_dependency)
+if(MSVC)
+  set(CompileFeatures_ARGS "-DNO_LinkImplementationFeatureCycle=1")
+endif()
 add_RunCMake_test(CompileFeatures)
 add_RunCMake_test(WriteCompilerDetectionHeader)
 if(NOT WIN32)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index f890f24..4c04e78 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,10 +27,10 @@ if (NOT CXX_FEATURES)
   run_cmake(NoSupportedCxxFeatures)
   run_cmake(NoSupportedCxxFeaturesGenex)
 else()
-  if(NOT MSVC)
+  if(NOT NO_LinkImplementationFeatureCycle)
     run_cmake(LinkImplementationFeatureCycle)
-    run_cmake(LinkImplementationFeatureCycleSolved)
   endif()
+  run_cmake(LinkImplementationFeatureCycleSolved)
 
   if (";${CXX_FEATURES};" MATCHES ";cxx_final;")
     set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1")

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                     |    3 +++
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake