Mercurial > hg > orthanc
comparison Resources/CMake/DownloadPackage.cmake @ 1111:929bf8c2123d
Fixes for Visual Studio 2013 64bit
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 01 Sep 2014 11:23:13 +0200 |
parents | ee0d5abf7958 |
children | fbf763bb1fa3 |
comparison
equal
deleted
inserted
replaced
1110:becde5351e47 | 1111:929bf8c2123d |
---|---|
13 ## | 13 ## |
14 ## Check the existence of the required decompression tools | 14 ## Check the existence of the required decompression tools |
15 ## | 15 ## |
16 | 16 |
17 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") | 17 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") |
18 find_program(ZIP_EXECUTABLE 7z PATHS "$ENV{ProgramFiles}/7-Zip") | 18 find_program(ZIP_EXECUTABLE 7z |
19 PATHS | |
20 "$ENV{ProgramFiles}/7-Zip" | |
21 "$ENV{ProgramW6432}/7-Zip" | |
22 ) | |
23 | |
19 if (${ZIP_EXECUTABLE} MATCHES "ZIP_EXECUTABLE-NOTFOUND") | 24 if (${ZIP_EXECUTABLE} MATCHES "ZIP_EXECUTABLE-NOTFOUND") |
20 message(FATAL_ERROR "Please install the '7-zip' software (http://www.7-zip.org/)") | 25 message(FATAL_ERROR "Please install the '7-zip' software (http://www.7-zip.org/)") |
21 endif() | 26 endif() |
22 | 27 |
23 else() | 28 else() |