potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

ICV: added package downloader

Browse Source
This commit is contained in:
Alexander Alekhin
2014-04-10 15:42:57 +04:00
parent 7b366df822
commit 047d285b7d
3 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindIPP.cmake
+7 -2
View File
@@ -140,7 +140,7 @@ macro(ipp_detect_version)
else()
_ipp_not_supported("IPP ${IPP_VERSION_STR} at ${IPP_ROOT_DIR} is not supported")
endif()
if(X86_64)
if(IPP_X64)
_ipp_set_library_dir(${IPP_LIBRARY_DIR}/intel64)
else()
_ipp_set_library_dir(${IPP_LIBRARY_DIR}/ia32)
@@ -221,7 +221,12 @@ if(DEFINED ENV{OPENCV_IPP_PATH} AND NOT DEFINED IPPROOT)
set(IPPROOT "$ENV{OPENCV_IPP_PATH}")
endif()
if(NOT DEFINED IPPROOT)
set(IPPROOT "${OpenCV_SOURCE_DIR}/3rdparty/ippicv")
include("${OpenCV_SOURCE_DIR}/3rdparty/ippicv/downloader.cmake")
if(DEFINED OPENCV_ICV_PATH)
set(IPPROOT "${OPENCV_ICV_PATH}")
else()
return()
endif()
endif()
# Try ICV