[Cmake-commits] CMake branch, next, updated. v3.1.0-1443-g8ad33e0

[Robert Maynard]

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  8ad33e01d2ed27c9ac136fd19516a21449b4c87b (commit)
       via  b97c86b5009307e6b089bcc2ddef55d77918f765 (commit)
       via  2c528f860ff8ea458fbf8ab6c85908aeeaa749e0 (commit)
      from  ff99adb80d59dcbe8cb0d9dc12db657a2f58be7e (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=8ad33e01d2ed27c9ac136fd19516a21449b4c87b
commit 8ad33e01d2ed27c9ac136fd19516a21449b4c87b
Merge: ff99adb b97c86b
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Dec 31 10:29:37 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 31 10:29:37 2014 -0500

    Merge topic 'feature_record_msvc' into next
    
    b97c86b5 CompileFeatures: Support compilers that don't have version modess.
    2c528f86 CompileFeatures: NonValidTarget1 now handles not have cxx_final.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b97c86b5009307e6b089bcc2ddef55d77918f765
commit b97c86b5009307e6b089bcc2ddef55d77918f765
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Dec 31 10:27:24 2014 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Dec 31 10:27:24 2014 -0500

    CompileFeatures: Support compilers that don't have version modess.
    
    compilers such as MSVC have no explicit flags to enable C++11 mode,
    it just is always on. So only run the link tests with compilers that require
    a flag to specify the language version.

diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 1892a5c..e4abed5 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,8 +27,13 @@ if (NOT CXX_FEATURES)
   run_cmake(NoSupportedCxxFeatures)
   run_cmake(NoSupportedCxxFeaturesGenex)
 else()
-  run_cmake(LinkImplementationFeatureCycle)
-  run_cmake(LinkImplementationFeatureCycleSolved)
+  #compilers such as MSVC have no explicit flags to enable C++11 mode,
+  #it just is always on. So only run the link tests with compilers that require
+  #a flag to specify the language version.
+  if(CMAKE_CXX11_STANDARD_COMPILE_OPTION)
+    run_cmake(LinkImplementationFeatureCycle)
+    run_cmake(LinkImplementationFeatureCycleSolved)
+  endif()
 
   if (";${CXX_FEATURES};" MATCHES ";cxx_final;")
     set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c528f860ff8ea458fbf8ab6c85908aeeaa749e0
commit 2c528f860ff8ea458fbf8ab6c85908aeeaa749e0
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Dec 31 10:25:33 2014 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Dec 31 10:25:33 2014 -0500

    CompileFeatures: NonValidTarget1 now handles not have cxx_final.
    
    Previously we expanded HAVE_FINAL to determine what the copied_file number
    would be, but when we don't have cxx_final than HAVE_FINAL is not defined.
    What we really want is to use expected_result.

diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
index c6707c1..b544b99 100644
--- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
+++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
@@ -7,7 +7,7 @@ else()
   set(expected_result 0)
 endif()
 
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${HAVE_FINAL}.cpp"
+add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp"
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp"
 )
 

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake |    2 +-
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake    |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake