[Cmake-commits] CMake branch, next, updated. v2.8.8-3341-gb1f4abf

[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  b1f4abf6168623e749356665c7503590959e1335 (commit)
       via  848f2201c59c3d19243ed093db6e9ffbfd7b4698 (commit)
       via  3cb7eefd55cada0e334bbe4adf3b2ca4b3dfd70d (commit)
      from  e4f9a0cc08c38a07cf21662ecc455bcd058c3e1b (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=b1f4abf6168623e749356665c7503590959e1335
commit b1f4abf6168623e749356665c7503590959e1335
Merge: e4f9a0c 848f220
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Thu Jun 28 07:57:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 28 07:57:03 2012 -0400

    Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests' into next
    
    848f220 Do not run cpack at CMake time it is not available.
    3cb7eef CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=848f2201c59c3d19243ed093db6e9ffbfd7b4698
commit 848f2201c59c3d19243ed093db6e9ffbfd7b4698
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Jun 28 13:49:49 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Jun 28 13:49:49 2012 +0200

    Do not run cpack at CMake time it is not available.
    
    cpack was used to get the list of available i.e. ACTIVE CPack generators
    in the CMake tests suite. This was done in order to get dynamically
    available CPack generators like DEB or RPM that may or may not be
    available on some platform like MacOSX depending on the fact that
    some command are installed or not. We may do that but not during
    initial configuration.
    The current patch fixes the problem and we may do better in the future
    like configuring CPack tests later.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9deb8ac..e631194 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -717,31 +717,21 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   ENDIF(CTEST_RUN_CPackComponents)
 
   IF(CTEST_RUN_CPackComponentsForAll)
-    # Analyze 'cpack --help' output for list of available generators:
-    execute_process(COMMAND ${CMAKE_CPACK_COMMAND} --help
-      RESULT_VARIABLE result
-      OUTPUT_VARIABLE stdout
-      ERROR_VARIABLE stderr)
-
-    string(REPLACE ";" "\\;" stdout "${stdout}")
-    string(REPLACE "\n" "E;" stdout "${stdout}")
-
-    set(collecting 0)
-    set(ACTIVE_CPACK_GENERATORS)
-    foreach(eline ${stdout})
-      string(REGEX REPLACE "^(.*)E$" "\\1" line "${eline}")
-      if(collecting AND NOT line STREQUAL "")
-        string(REGEX REPLACE "^  ([^ ]+) += (.*)$" "\\1" gen "${line}")
-        string(REGEX REPLACE "^  ([^ ]+) += (.*)$" "\\2" doc "${line}")
-        list(APPEND ACTIVE_CPACK_GENERATORS ${gen})
-      endif()
-      if(line STREQUAL "Generators")
-        set(collecting 1)
-      endif()
-    endforeach()
+    # Check whether if rpmbuild command is found
+    # before adding RPM tests
+    find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
+    if(RPMBUILD_EXECUTABLE)
+      list(APPEND ACTIVE_CPACK_GENERATORS RPM)
+    endif(RPMBUILD_EXECUTABLE)
+    # Check whether if dpkg command is found
+    # before adding DEB tests
+    find_program(DPKG_EXECUTABLE NAMES dpkg)
+    if(DPKG_EXECUTABLE)
+      list(APPEND ACTIVE_CPACK_GENERATORS DEB)
+    endif(DPKG_EXECUTABLE)
+
     # ACTIVE_CPACK_GENERATORS variable
     # now contains the list of 'active generators'
-
     set(CPackComponentsForAll_EXTRA_OPTIONS)
     set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}")
     # set up list of CPack generators

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Tests/CMakeLists.txt      |   36 +++++++++++++-----------------------
 2 files changed, 14 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake