Mercurial > hg > orthanc
comparison Resources/CMake/DownloadPackage.cmake @ 75:8b1428915a46
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 17 Sep 2012 16:31:30 +0200 |
parents | 09718f2fc5cb |
children | b8dfde8d64e8 |
comparison
equal
deleted
inserted
replaced
74:09718f2fc5cb | 75:8b1428915a46 |
---|---|
57 elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") | 57 elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") |
58 FIND_PROGRAM(ZIP_EXECUTABLE 7z PATHS "$ENV{ProgramFiles}/7-Zip") | 58 FIND_PROGRAM(ZIP_EXECUTABLE 7z PATHS "$ENV{ProgramFiles}/7-Zip") |
59 | 59 |
60 if (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz")) | 60 if (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz")) |
61 execute_process( | 61 execute_process( |
62 COMMAND ${ZIP_EXECUTABLE} e ${TMP_PATH} | 62 COMMAND ${ZIP_EXECUTABLE} e -y ${TMP_PATH} |
63 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 63 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
64 RESULT_VARIABLE Failure | 64 RESULT_VARIABLE Failure |
65 OUTPUT_QUIET | 65 OUTPUT_QUIET |
66 ) | 66 ) |
67 | 67 |
79 string(REGEX REPLACE ".gz$" "" TMP_FILENAME2 "${TMP_FILENAME}") | 79 string(REGEX REPLACE ".gz$" "" TMP_FILENAME2 "${TMP_FILENAME}") |
80 endif() | 80 endif() |
81 | 81 |
82 if (TMP_LENGTH EQUAL 0) | 82 if (TMP_LENGTH EQUAL 0) |
83 execute_process( | 83 execute_process( |
84 COMMAND ${ZIP_EXECUTABLE} x ${TMP_FILENAME2} | 84 COMMAND ${ZIP_EXECUTABLE} x -y ${TMP_FILENAME2} |
85 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 85 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
86 RESULT_VARIABLE Failure | 86 RESULT_VARIABLE Failure |
87 OUTPUT_QUIET | 87 OUTPUT_QUIET |
88 ) | 88 ) |
89 else() | 89 else() |
90 foreach(SUBDIR ${ARGS}) | 90 foreach(SUBDIR ${ARGS}) |
91 execute_process( | 91 execute_process( |
92 COMMAND ${ZIP_EXECUTABLE} x "-i!${SUBDIR}" "${TMP_FILENAME2}" | 92 COMMAND ${ZIP_EXECUTABLE} x -y "-i!${SUBDIR}" "${TMP_FILENAME2}" |
93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
94 RESULT_VARIABLE Failure | 94 RESULT_VARIABLE Failure |
95 OUTPUT_QUIET | 95 OUTPUT_QUIET |
96 ) | 96 ) |
97 | 97 |
100 endif() | 100 endif() |
101 endforeach() | 101 endforeach() |
102 endif() | 102 endif() |
103 elseif ("${TMP_EXTENSION}" STREQUAL "zip") | 103 elseif ("${TMP_EXTENSION}" STREQUAL "zip") |
104 execute_process( | 104 execute_process( |
105 COMMAND ${ZIP_EXECUTABLE} x ${TMP_PATH} | 105 COMMAND ${ZIP_EXECUTABLE} x -y ${TMP_PATH} |
106 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 106 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
107 RESULT_VARIABLE Failure | 107 RESULT_VARIABLE Failure |
108 OUTPUT_QUIET | 108 OUTPUT_QUIET |
109 ) | 109 ) |
110 else() | 110 else() |