[Cmake-commits] CMake branch, next, updated. v3.0.1-5088-g338b2ed

[Nils Gladitz]

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  338b2ed88f8a53143185979516b5e39cb3a47e57 (commit)
       via  4952030c2e5dba694ef4e7071a296fee07a19f1f (commit)
      from  4d85cc8398555c82938e54afe2b79845d5962fae (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=338b2ed88f8a53143185979516b5e39cb3a47e57
commit 338b2ed88f8a53143185979516b5e39cb3a47e57
Merge: 4d85cc8 4952030
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Sep 2 02:54:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 2 02:54:07 2014 -0400

    Merge topic 'wix-log-on-failure' into next
    
    4952030c CPackWiX: Attach wix.log on test failure.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4952030c2e5dba694ef4e7071a296fee07a19f1f
commit 4952030c2e5dba694ef4e7071a296fee07a19f1f
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 1 09:09:00 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Sep 2 08:53:34 2014 +0200

    CPackWiX: Attach wix.log on test failure.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f51a934..c22170f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -863,6 +863,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
           "-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator"
           "-Dconfig=\${CTEST_CONFIGURATION_TYPE}"
           -P "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake")
+
+      set_property(TEST CPackWiXGenerator PROPERTY
+        ATTACHED_FILES_ON_FAIL
+        "${CMake_BINARY_DIR}/Tests/CPackWiXGenerator/_CPack_Packages/win32/WIX/wix.log")
     endif()
   endif()
 

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

Summary of changes:


hooks/post-receive
-- 
CMake