mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 20:46:41 +08:00
d85a40d478
* [opencv3] uniform CONTROL file with opencv4 port * [opencv3] uniform portfile with opencv4 * [opencv3] uniform CONTROL file with opencv4 port * [opencv3] update to 3.4.7 draft * [OpenCV 3] wip to uniform port to opencv4 standards * [OpenCV3] fix IPPICV integration, use the same mechanism as in OpenCV4 port * [OpenCV3] fix sfm module * [OpenCV3] update hunk references in patches 0001 and 0009 * [OpenCV3] refresh install options to adhere to opencv4 standards * [opencv3] remove leftovers * [opencv3] Use OUT_FEATURE_OPTIONS with vcpkg_check_features()
14 lines
815 B
Diff
14 lines
815 B
Diff
diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
|
|
index cdc47ad..175aaf3 100644
|
|
--- a/cmake/OpenCVDownload.cmake
|
|
+++ b/cmake/OpenCVDownload.cmake
|
|
@@ -154,6 +154,8 @@ function(ocv_download)
|
|
# Download
|
|
if(NOT EXISTS "${CACHE_CANDIDATE}")
|
|
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
|
|
+ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
|
|
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )")
|
|
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
|
|
INACTIVITY_TIMEOUT 60
|
|
TIMEOUT 600
|