fixed IPP detection on 64-bit linux

git-svn-id: https://code.ros.org/svn/opencv/trunk@2157 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index f20b711661f4bb6d986e874f24bb5b7ea60202e2..a0f14c304b28c0e16ee8669d497d779c549e5f5f 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -431,19 +431,27 @@ else()
 endif()\r
 endif()\r
 \r
-message(STATUS "${CMAKE_SYSTEM_LIBRARY_PATH}" "${CMAKE_LIBRARY_PATH}")\r
-\r
 foreach(v "6.1" "6.0" "5.3" "5.2" "5.1")\r
     if(NOT IPP_FOUND)\r
         if(WIN32)\r
             find_path(IPP_PATH "ippi-${v}.dll"\r
                 PATHS ${CMAKE_PROGRAM_PATH} ${CMAKE_SYSTEM_PROGRAM_PATH}\r
                 DOC "The path to IPP dynamic libraries")\r
+            if(NOT IPP_PATH)\r
+                find_path(IPP_PATH "ippiem64t-${v}.dll"\r
+                    PATHS ${CMAKE_PROGRAM_PATH} ${CMAKE_SYSTEM_PROGRAM_PATH}\r
+                    DOC "The path to IPP dynamic libraries")\r
+            endif()\r
         endif()\r
         if(UNIX)\r
             find_path(IPP_PATH "libippi${CMAKE_SHARED_LIBRARY_SUFFIX}.${v}"\r
                 PATHS ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} ENV ${OPENCV_LOADER_PATH}\r
                 DOC "The path to IPP dynamic libraries")\r
+            if(NOT IPP_PATH)\r
+                find_path(IPP_PATH "libippiem64t${CMAKE_SHARED_LIBRARY_SUFFIX}.${v}"\r
+                    PATHS ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} ENV ${OPENCV_LOADER_PATH}\r
+                    DOC "The path to IPP dynamic libraries")\r
+            endif()\r
         endif()\r
         if(IPP_PATH)\r
             file(GLOB IPP_HDRS "${IPP_PATH}/../include")\r
@@ -462,8 +470,14 @@ if(IPP_FOUND AND USE_IPP)
     include_directories("${IPP_PATH}/../include")\r
     link_directories("${IPP_PATH}/../lib")\r
     \r
+    file(GLOB em64t_files "${IPP_PATH}/../lib/*em64t*")\r
+    set(IPP_ARCH)\r
+    if(em64t_files)\r
+        set(IPP_ARCH "em64t")\r
+    endif()\r
+    \r
     set(A ${CMAKE_STATIC_LIBRARY_PREFIX})\r
-    set(B ${CMAKE_STATIC_LIBRARY_SUFFIX})\r
+    set(B ${IPP_ARCH}${CMAKE_STATIC_LIBRARY_SUFFIX})\r
     if(WIN32)\r
         set(L l)\r
     else()\r
@@ -911,9 +925,9 @@ message(STATUS "    Old Python:                0")
 endif()\r
 message(STATUS "    Python:                    ${BUILD_NEW_PYTHON_SUPPORT}")\r
 if(IPP_FOUND AND USE_IPP)\r
-message(STATUS "    Use IPP:                   1")\r
+message(STATUS "    Use IPP:                   ${IPP_PATH}")\r
 else()\r
-message(STATUS "    Use IPP:                   0")\r
+message(STATUS "    Use IPP:                   NO")\r
 endif()\r
 if(BUILD_LATEX_DOCS AND PDFLATEX_COMPILER)\r
 message(STATUS "    Build Documentation        1")\r