[Cmake-commits] CMake branch, next, updated. v3.1.0-1649-gc7fb8d3

[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  c7fb8d364b6915cd603573fdfb4670c88d728050 (commit)
       via  c453fb77986632531d7835e4a4e7433edc004206 (commit)
      from  57e8b86866517c1fdc75b93fdc03b791247f95dd (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=c7fb8d364b6915cd603573fdfb4670c88d728050
commit c7fb8d364b6915cd603573fdfb4670c88d728050
Merge: 57e8b86 c453fb7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 10 12:57:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 10 12:57:41 2015 -0500

    Merge topic 'feature_record_msvc' into next
    
    c453fb77 fixup! Features: Properly evaluate if the compiler supports cxx_final.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c453fb77986632531d7835e4a4e7433edc004206
commit c453fb77986632531d7835e4a4e7433edc004206
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 10 12:53:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 10 12:54:49 2015 -0500

    fixup! Features: Properly evaluate if the compiler supports cxx_final.
    
    Always reference the source file with a consistent name.

diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
index b544b99..4de8e88 100644
--- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
+++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
@@ -11,7 +11,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_res
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp"
 )
 
-add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp")
+add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp")
 if (HAVE_FINAL)
   target_compile_features(empty PRIVATE cxx_final)
 endif()

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake