move dependencies to https://download.01.org/opencv/master

diff --git a/cmake/download/download_and_extract.cmake b/cmake/download/download_and_extract.cmake
index 862d43d..2b831e4 100644 (file)
--- a/cmake/download/download_and_extract.cmake
+++ b/cmake/download/download_and_extract.cmake
@@ -7,7 +7,7 @@ include ("download_and_check")
 
 function (GetNameAndUrlToDownload name url archive_name_unified archive_name_win archive_name_lin archive_name_mac archive_name_android)
   if (archive_name_unified)
-    set (${url} "${archive_name_unified}" PARENT_SCOPE)
+    set (${url} "thirdparty/unified/${archive_name_unified}" PARENT_SCOPE)
     set (${name} ${archive_name_unified} PARENT_SCOPE)
   else()
     if(archive_name_lin)
@@ -27,7 +27,7 @@ function (GetNameAndUrlToDownload name url archive_name_unified archive_name_win
     endif()
 
     set (${name} ${archive_name} PARENT_SCOPE)
-    set (${url}  "${archive_name}" PARENT_SCOPE)
+    set (${url}  "thirdparty/${PLATFORM_FOLDER}/${archive_name}" PARENT_SCOPE)
   endif()
 endfunction(GetNameAndUrlToDownload)
 
@@ -156,7 +156,7 @@ function (CheckOrDownloadAndExtract component RELATIVE_URL archive_name unpacked
   elseif(DEFINED ENV{IE_PATH_TO_DEPS})
     set(URL "$ENV{IE_PATH_TO_DEPS}/${RELATIVE_URL}")
   else()
-    set(URL "https://download.01.org/opencv/master/openvinotoolkit/2020/inference_engine/${RELATIVE_URL}")
+    set(URL "https://download.01.org/opencv/master/openvinotoolkit/${RELATIVE_URL}")
   endif()
 
   #no message on recursive calls

diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
index 5bf488d..ae9d689 100644 (file)
--- a/inference-engine/cmake/dependencies.cmake
+++ b/inference-engine/cmake/dependencies.cmake
@@ -140,7 +140,7 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
                     ENVIRONMENT "TBBROOT")
         elseif(LINUX AND AARCH64)
             RESOLVE_DEPENDENCY(TBB
-                    ARCHIVE_LIN "tbb2020_38404_kmb.tgz"
+                    ARCHIVE_LIN "keembay/tbb2020_38404_kmb.tgz"
                     TARGET_PATH "${TEMP}/tbb_yocto"
                     ENVIRONMENT "TBBROOT")
         elseif(APPLE AND X86_64)
@@ -192,7 +192,7 @@ if (ENABLE_OPENCV)
             set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}")
 
             RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_LIN "opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
+                    ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
                     TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv"
                     ENVIRONMENT "OpenCV_DIR"
                     VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
@@ -202,13 +202,13 @@ if (ENABLE_OPENCV)
     else()
         if (WIN32 AND X86_64)
             RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_WIN "opencv_${OPENCV_VERSION}-${OPENCV_BUILD}.txz"
+                    ARCHIVE_WIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}.txz"
                     TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}/opencv"
                     ENVIRONMENT "OpenCV_DIR"
                     VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
         elseif(APPLE AND X86_64)
             RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_MAC "opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_osx.txz"
+                    ARCHIVE_MAC "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_osx.txz"
                     TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_osx/opencv"
                     ENVIRONMENT "OpenCV_DIR"
                     VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
@@ -228,7 +228,7 @@ if (ENABLE_OPENCV)
                 message(FATAL_ERROR "OpenCV is not available on current platform")
             endif()
             RESOLVE_DEPENDENCY(OPENCV
-                    ARCHIVE_LIN "opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
+                    ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz"
                     TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv"
                     ENVIRONMENT "OpenCV_DIR"
                     VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
@@ -267,17 +267,17 @@ if (ENABLE_GNA)
             libGNA_LIBRARIES_BASE_PATH)
     if (GNA_LIBRARY_VERSION STREQUAL "GNA1")
         RESOLVE_DEPENDENCY(GNA
-                ARCHIVE_UNIFIED "gna_20181120.zip"
+                ARCHIVE_UNIFIED "GNA/gna_20181120.zip"
                 TARGET_PATH "${TEMP}/gna")
     else()
         if(GNA_LIBRARY_VERSION STREQUAL "GNA1_1401")
             set(GNA_VERSION "01.00.00.1401")
         endif()
         if(GNA_LIBRARY_VERSION STREQUAL "GNA2")
-            set(GNA_VERSION "02.00.00.0654")
+            set(GNA_VERSION "02.00.00.0925")
         endif()
         RESOLVE_DEPENDENCY(GNA
-                ARCHIVE_UNIFIED "GNA_${GNA_VERSION}.zip"
+                ARCHIVE_UNIFIED "GNA/GNA_${GNA_VERSION}.zip"
                 TARGET_PATH "${TEMP}/gna_${GNA_VERSION}"
                 VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*")
     endif()

diff --git a/inference-engine/cmake/vpu_dependencies.cmake b/inference-engine/cmake/vpu_dependencies.cmake
index 252c4c7..6cd87bf 100644 (file)
--- a/inference-engine/cmake/vpu_dependencies.cmake
+++ b/inference-engine/cmake/vpu_dependencies.cmake
@@ -38,7 +38,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
     reset_deps_cache(VPU_FIRMWARE_${firmware_name_upper}_FILE)
 
     RESOLVE_DEPENDENCY(VPU_FIRMWARE_${firmware_name_upper}
-        ARCHIVE_UNIFIED firmware_${firmware_name}_${FIRMWARE_PACKAGE_VERSION}.zip
+        ARCHIVE_UNIFIED VPU/${firmware_name}/firmware_${firmware_name}_${FIRMWARE_PACKAGE_VERSION}.zip
         TARGET_PATH "${TEMP}/vpu/firmware/${firmware_name}"
         ENVIRONMENT "VPU_FIRMWARE_${firmware_name_upper}_FILE"
         FOLDER)