[Cmake-commits] CMake branch, next, updated. v2.8.4-1078-g90deaa3

[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  90deaa3315ab9024e7d1e906f7c00adfa5b84976 (commit)
       via  e4d4dfc6ef2cfaac34d8097da016f12a07113a3f (commit)
      from  9feea1200a40f59d70e35034ccc91256e34789cd (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=90deaa3315ab9024e7d1e906f7c00adfa5b84976
commit 90deaa3315ab9024e7d1e906f7c00adfa5b84976
Merge: 9feea12 e4d4dfc
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Thu Mar 3 14:46:31 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 3 14:46:31 2011 -0500

    Merge topic 'CPackRPM-enableCPackTests' into next
    
    e4d4dfc CPackRPM  activate CPackRPM test on Linux systems where rpmbuild is found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4d4dfc6ef2cfaac34d8097da016f12a07113a3f
commit e4d4dfc6ef2cfaac34d8097da016f12a07113a3f
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Mar 3 20:45:43 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Mar 3 20:45:43 2011 +0100

    CPackRPM  activate CPackRPM test on Linux systems where rpmbuild is found

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f418058..b27477c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -566,6 +566,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}")
     # set up list of CPack generators
     list(APPEND GENLST "ZIP")
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+        find_program(RPMBUILD NAMES rpmbuild)
+    endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    if (RPMBUILD)
+       list(APPEND GENLST "RPM")
+    endif(RPMBUILD)
     # set up list of component packaging ways
     list(APPEND CWAYLST "default")
     list(APPEND CWAYLST "OnePackPerGroup")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 45a3b17..2e543f3 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -50,6 +50,23 @@ if(CPackGen MATCHES "ZIP")
     if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
         set(expected_count 1)
     endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
+elseif (CPackGen MATCHES "RPM")
+    set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm")
+    if (${CPackComponentWay} STREQUAL "default")
+        set(expected_count 1)
+    endif(${CPackComponentWay} STREQUAL "default")
+    if (${CPackComponentWay} STREQUAL "OnePackPerGroup")
+        set(expected_count 2)
+    endif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
+    if (${CPackComponentWay} STREQUAL "IgnoreGroup")
+        set(expected_count 4)
+    endif (${CPackComponentWay} STREQUAL "IgnoreGroup")
+    if (${CPackComponentWay} STREQUAL "AllInOne")
+        set(expected_count 1)
+    endif (${CPackComponentWay} STREQUAL "AllInOne")
+    if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
+        set(expected_count 1)
+    endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
 endif(CPackGen MATCHES "ZIP")
 
 # clean-up previously CPack generated files

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

Summary of changes:
 Tests/CMakeLists.txt                               |    6 ++++++
 .../RunCPackVerifyResult.cmake                     |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake