Merge pull request opencv#17576 from philippefoubert:branch_ximea

smallapple67 · Jun 22, 2020 · 6e5f0a2 · 6e5f0a2
2 parents 721fac5 + 0eb7060
commit 6e5f0a2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/videoio/cmake/detect_ximea.cmake b/modules/videoio/cmake/detect_ximea.cmake
@@ -6,10 +6,10 @@ if(NOT HAVE_XIMEA)
     endif()
   endif()
   if(X86_64)
-    set(lib_dir "x64")
+    set(lib_dir "API/x64" "API/64bit")
     set(lib_suffix "64")
   else()
-    set(lib_dir "x86")
+    set(lib_dir "API/x86" "API/32bit")
     set(lib_suffix "32")
   endif()
   find_path(XIMEA_INCLUDE "xiApi.h"
@@ -19,7 +19,7 @@ if(NOT HAVE_XIMEA)
   find_library(XIMEA_LIBRARY m3api xiapi${lib_suffix}
     PATHS "${XIMEA_ROOT}" ENV XIMEA_ROOT "/opt/XIMEA"
     HINTS "${regpath}"
-    PATH_SUFFIXES "API/${lib_dir}")
+    PATH_SUFFIXES ${lib_dir})
   if(XIMEA_INCLUDE AND XIMEA_LIBRARY)
     set(HAVE_XIMEA TRUE)
   endif()