[Cmake-commits] CMake branch, next, updated. v2.8.4-1133-g1d799ea

[Eric Noulard]

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  1d799eab201c81822cf0a36aa07c1d862a2aa165 (commit)
       via  7ebbcf19deacf0e894496d5bda1661142bd94702 (commit)
      from  19b6961b88c7be34061ed206615cfb1c6177af69 (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=1d799eab201c81822cf0a36aa07c1d862a2aa165
commit 1d799eab201c81822cf0a36aa07c1d862a2aa165
Merge: 19b6961 7ebbcf1
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 12:33:17 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 12:33:17 2011 -0500

    Merge topic 'CPackRPM-TestWithMoreTraces' into next
    
    7ebbcf1 CPackRPM  non matching ENDIF


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ebbcf19deacf0e894496d5bda1661142bd94702
commit 7ebbcf19deacf0e894496d5bda1661142bd94702
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Mar 10 18:32:47 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Mar 10 18:32:47 2011 +0100

    CPackRPM  non matching ENDIF

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 255ad9a..26209a7 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -651,7 +651,7 @@ IF(RPMBUILD_EXECUTABLE)
     MESSAGE("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
     MESSAGE("CPackRPM:Debug:    - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.out")
     MESSAGE("CPackRPM:Debug: *** ${RPMBUILDERR} ***")
-  ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+  ENDIF(CPACK_RPM_PACKAGE_DEBUG OR CPACK_RPMBUILD_EXEC_RESULT)
 ELSE(RPMBUILD_EXECUTABLE)
   IF(ALIEN_EXECUTABLE)
     MESSAGE(FATAL_ERROR "RPM packaging through alien not done (yet)")

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

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


hooks/post-receive
-- 
CMake