generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another attempt to fix IPP detection on x64 (ticket #1294)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-08-11 22:18:51 +00:00
parent 2fe3ed75c1
commit 1e6f1cc15c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenCVFindIPP.cmake
View File

@ -43,6 +43,14 @@ set(IPPCV "cv") # computer vision
set(IPPVM "vm") # vector math
set(IPP_X64 0)
if (CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(IPP_X64 1)
endif()
if (CMAKE_CL_64)
set(IPP_X64 1)
endif()
# ------------------------------------------------------------------------
# This function detect IPP version by analyzing ippversion.h file
# Note, ippversion.h file was inroduced since IPP 5.3
@ -96,11 +104,7 @@ function(set_ipp_old_libraries)
set(IPPCV "cv") # computer vision
set(IPPVM "vm") # vector math
if (CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(IPP_ARCH "em64t")
endif()
if (CMAKE_CL_64)
if (IPP_X64)
set(IPP_ARCH "em64t")
endif()
@ -171,7 +175,7 @@ function(set_ipp_variables _LATEST_VERSION)
set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include PARENT_SCOPE)
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib PARENT_SCOPE)
if (CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
if (IPP_X64)
if(NOT EXISTS ${IPP_ROOT_DIR}/../em64t)
message(SEND_ERROR "IPP EM64T libraries not found")
endif()
@ -192,7 +196,7 @@ function(set_ipp_variables _LATEST_VERSION)
# set INCLUDE and LIB folders
set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include PARENT_SCOPE)
if (CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
if (IPP_X64)
if(NOT EXISTS ${IPP_ROOT_DIR}/lib/intel64)
message(SEND_ERROR "IPP EM64T libraries not found")
endif()