[Cmake-commits] CMake branch, next, updated. v3.1.0-1325-g389409b

[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  389409be3b5b11e8604429179d4998764268fa24 (commit)
       via  e7781c6bbdb2074234bb4115fb50ad1c81998255 (commit)
      from  ac68de2c4e85fc22d468b73c55602896625859c5 (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=389409be3b5b11e8604429179d4998764268fa24
commit 389409be3b5b11e8604429179d4998764268fa24
Merge: ac68de2 e7781c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 10:35:31 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 22 10:35:31 2014 -0500

    Merge topic 'AppleClang-5.1-features' into next
    
    e7781c6b Tests: Fix RunCMake.CompileFeatures test on Xcode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7781c6bbdb2074234bb4115fb50ad1c81998255
commit e7781c6bbdb2074234bb4115fb50ad1c81998255
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 10:34:12 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 22 10:34:12 2014 -0500

    Tests: Fix RunCMake.CompileFeatures test on Xcode
    
    In the NonValidTarget2 test case, mark the generated source file with
    the GENERATED property explicitly since it is not marked automatically
    as the output of any custom command.  Mark both the 0 and 1 variants
    so it works no matter the outcome of the generator expression.

diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget2.cmake b/Tests/RunCMake/CompileFeatures/NonValidTarget2.cmake
index eb84692..c41bf57 100644
--- a/Tests/RunCMake/CompileFeatures/NonValidTarget2.cmake
+++ b/Tests/RunCMake/CompileFeatures/NonValidTarget2.cmake
@@ -4,5 +4,7 @@ set(genexvar $<COMPILE_FEATURES:cxx_final>)
 add_custom_target(copy_target
   COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.txt"
 )
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/copied_file0.cpp" PROPERTY GENERATED 1)
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/copied_file1.cpp" PROPERTY GENERATED 1)
 
 add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp")

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

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


hooks/post-receive
-- 
CMake