[Cmake-commits] CMake branch, next, updated. v3.2.2-2505-g9fa1bcb

[Domen Vrankar]

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  9fa1bcba9125efa0a379f16d1019c2dde1c2282f (commit)
       via  1a2a73a5181fd519559e140da24fcd2d9b33fdca (commit)
       via  9e3181a1128e7d4f830f56da397f0aaa04cb558d (commit)
      from  935bc37896af130b31b064df495171411a9d3f0a (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=9fa1bcba9125efa0a379f16d1019c2dde1c2282f
commit 9fa1bcba9125efa0a379f16d1019c2dde1c2282f
Merge: 935bc37 1a2a73a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue May 5 01:48:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 5 01:48:50 2015 -0400

    Merge topic 'cpack-rpm-debug-log-fix' into next
    
    1a2a73a5 CPack/RPM fix output in debug log
    9e3181a1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a2a73a5181fd519559e140da24fcd2d9b33fdca
commit 1a2a73a5181fd519559e140da24fcd2d9b33fdca
Author:     Thomas Orozco <thomas at orozco.fr>
AuthorDate: Tue May 5 07:47:10 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue May 5 07:47:10 2015 +0200

    CPack/RPM fix output in debug log
    
    output RPMBUILDOUT when intended

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index fdba90e..e672e72 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1686,7 +1686,7 @@ mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT
       message("CPackRPM:Debug:    - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.err")
       message("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
       message("CPackRPM:Debug:    - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.out")
-      message("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
+      message("CPackRPM:Debug: *** ${RPMBUILDOUT} ***")
     endif()
   else()
     if(ALIEN_EXECUTABLE)

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

Summary of changes:
 Modules/CPackRPM.cmake    |    2 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake