[Cmake-commits] CMake branch, next, updated. v3.7.2-2278-g639429c

[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  639429cb85ed679c38223c7be1c4a0dfd3b3de39 (commit)
       via  82eb1702d16723c4f997ded593cbe7cb0ca75999 (commit)
      from  bb234a4b50ecca06c00ab4f4cebdd44261f25653 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=639429cb85ed679c38223c7be1c4a0dfd3b3de39
commit 639429cb85ed679c38223c7be1c4a0dfd3b3de39
Merge: bb234a4 82eb170
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Jan 21 03:36:09 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 21 03:36:09 2017 -0500

    Merge topic 'cpack-stgz-minimal-test' into next
    
    82eb1702 fixup! CPack/STGZ: minimalistic packages test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82eb1702d16723c4f997ded593cbe7cb0ca75999
commit 82eb1702d16723c4f997ded593cbe7cb0ca75999
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Jan 21 09:34:54 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Jan 21 09:34:54 2017 +0100

    fixup! CPack/STGZ: minimalistic packages test

diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 96be71b..08224d3 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -10,15 +10,8 @@ function(getPackageContent FILE RESULT_VAR)
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   if(extract_result_)
-    find_program(TAIL_EXECUTABLE tail)
-    find_program(PAX_EXECUTABLE pax)
-    find_program(GTAR_EXECUTABLE gtar)
-    find_program(TAR_EXECUTABLE tar)
-    find_program(GUNZIP_EXECUTABLE gunzip)
-
-    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';"
-        "'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';"
-        "'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'")
+    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';"
+          " '${extract_error_}'.")
   endif()
 
   file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
index 46e7757..3b015ca 100644
--- a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
@@ -1,6 +1,11 @@
 function(get_test_prerequirements found_var config_file)
   if(EXISTS "/bin/sh")
-    file(WRITE "${config_file}" "")
-    set(${found_var} true PARENT_SCOPE)
+    #gunzip is not part of posix so we should not rely on it being installed
+    find_program(GUNZIP_EXECUTABLE gunzip)
+
+    if(GUNZIP_EXECUTABLE)
+      file(WRITE "${config_file}" "")
+      set(${found_var} true PARENT_SCOPE)
+    endif()
   endif()
 endfunction()

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

Summary of changes:
 Tests/RunCMake/CPack/STGZ/Helpers.cmake         |   11 ++---------
 Tests/RunCMake/CPack/STGZ/Prerequirements.cmake |    9 +++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake