Mercurial > hg > orthanc

changeset 74:09718f2fc5cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
silent unzip
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Sep 2012 16:27:25 +0200
parents cb5ad233c336
children 8b1428915a46
files INSTALL Resources/CMake/DownloadPackage.cmake
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL	Mon Sep 17 13:21:31 2012 +0200
+++ b/INSTALL	Mon Sep 17 16:27:25 2012 +0200
@@ -100,6 +100,7 @@
 
 NOTES:
 * More recent versions of Visual Studio should also work.
-* You might have to install the Platform SDK (version 6 or above):
+* You will have to install the Platform SDK (version 6 or above) for
+  Visual Studio 2005:
   http://en.wikipedia.org/wiki/Microsoft_Windows_SDK.
   Read the CMake FAQ: http://goo.gl/By90B 
--- a/Resources/CMake/DownloadPackage.cmake	Mon Sep 17 13:21:31 2012 +0200
+++ b/Resources/CMake/DownloadPackage.cmake	Mon Sep 17 16:27:25 2012 +0200
@@ -28,24 +28,25 @@
 
     GetUrlExtension(TMP_EXTENSION "${Url}")
     #message(${TMP_EXTENSION})
+    message("Uncompressing ${Url}")
 
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
       if ("${TMP_EXTENSION}" STREQUAL "zip")
         execute_process(
-          COMMAND sh -c "unzip ${TMP_PATH} ${UncompressArguments}"
+          COMMAND sh -c "unzip -q ${TMP_PATH} ${UncompressArguments}"
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
           RESULT_VARIABLE Failure
         )
       elseif (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz"))
         #message("tar xvfz ${TMP_PATH} ${UncompressArguments}")
         execute_process(
-          COMMAND sh -c "tar xvfz ${TMP_PATH} ${UncompressArguments}"
+          COMMAND sh -c "tar xfz ${TMP_PATH} ${UncompressArguments}"
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
           RESULT_VARIABLE Failure
           )
       elseif ("${TMP_EXTENSION}" STREQUAL "bz2")
         execute_process(
-          COMMAND sh -c "tar xvfj ${TMP_PATH} ${UncompressArguments}"
+          COMMAND sh -c "tar xfj ${TMP_PATH} ${UncompressArguments}"
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
           RESULT_VARIABLE Failure
           )
@@ -61,6 +62,7 @@
           COMMAND ${ZIP_EXECUTABLE} e ${TMP_PATH}
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
           RESULT_VARIABLE Failure
+          OUTPUT_QUIET
           )
 
         if (Failure)
@@ -82,6 +84,7 @@
             COMMAND ${ZIP_EXECUTABLE} x ${TMP_FILENAME2}
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
             RESULT_VARIABLE Failure
+            OUTPUT_QUIET
             )
         else()
           foreach(SUBDIR ${ARGS})
@@ -89,6 +92,7 @@
               COMMAND ${ZIP_EXECUTABLE} x "-i!${SUBDIR}" "${TMP_FILENAME2}"
               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
               RESULT_VARIABLE Failure
+              OUTPUT_QUIET
               )
 
             if (Failure)
@@ -101,6 +105,7 @@
           COMMAND ${ZIP_EXECUTABLE} x ${TMP_PATH}
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
           RESULT_VARIABLE Failure
+          OUTPUT_QUIET
           )
       else()
         message(FATAL_ERROR "Support your platform here")