Fixed PvAPI search on Windows #1927

CMakeLists.txt

@@ -408,11 +408,32 @@ endif(WITH_UNICAP)
 ocv_clear_vars(HAVE_PVAPI)
 if(WITH_PVAPI)
   find_path(PVAPI_INCLUDE_PATH "PvApi.h"
-            PATHS "/usr/local/include" "/usr/include"
+            PATHS /usr/local /opt /usr ENV ProgramFiles ENV ProgramW6432
+            PATH_SUFFIXES include "Allied Vision Technologies/GigESDK/inc-pc" "AVT GigE SDK/inc-pc" "GigESDK/inc-pc"
             DOC "The path to PvAPI header")
+
   if(PVAPI_INCLUDE_PATH)
+    if(X86 AND NOT WIN32)
+      set(PVAPI_SDK_SUBDIR x86)
+    elseif(X86_64)
+      set(PVAPI_SDK_SUBDIR x64)
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
+      set(PVAPI_SDK_SUBDIR arm)
+    endif()
+
+    get_filename_component(_PVAPI_LIBRARY "${PVAPI_INCLUDE_PATH}/../lib-pc" ABSOLUTE)
+    if(PVAPI_SDK_SUBDIR)
+      set(_PVAPI_LIBRARY "${_PVAPI_LIBRARY}/${PVAPI_SDK_SUBDIR}")
+    endif()
+    if(NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+      set(_PVAPI_LIBRARY "${_PVAPI_LIBRARY}/${CMAKE_OPENCV_GCC_VERSION_MAJOR}.${CMAKE_OPENCV_GCC_VERSION_MINOR}")
+    endif()
+
+    set(PVAPI_LIBRARY "${_PVAPI_LIBRARY}/${CMAKE_STATIC_LIBRARY_PREFIX}PvAPI${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE PATH "The PvAPI library")
+    if(EXISTS "${PVAPI_LIBRARY}")
       set(HAVE_PVAPI TRUE)
     endif()
+  endif(PVAPI_INCLUDE_PATH)
 endif(WITH_PVAPI)
 
 # --- Dc1394 ---

modules/highgui/CMakeLists.txt

@@ -157,19 +157,8 @@ endif(HAVE_FFMPEG)
 if(HAVE_PVAPI)
   add_definitions(-DHAVE_PVAPI)
   ocv_include_directories(${PVAPI_INCLUDE_PATH})
-  if(X86)
-    set(PVAPI_SDK_SUBDIR x86)
-  elseif(X86_64)
-    set(PVAPI_SDK_SUBDIR x64)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
-    set(PVAPI_SDK_SUBDIR arm)
-  endif()
-  if(PVAPI_SDK_SUBDIR AND CMAKE_COMPILER_IS_GNUCXX)
-    get_filename_component(PVAPI_EXPECTED_LIB_PATH "${PVAPI_INCLUDE_PATH}/../lib-pc/${PVAPI_SDK_SUBDIR}/${CMAKE_OPENCV_GCC_VERSION_MAJOR}.${CMAKE_OPENCV_GCC_VERSION_MINOR}" ABSOLUTE)
-    link_directories(${PVAPI_EXPECTED_LIB_PATH})
-  endif()
   set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs})
-  set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} PvAPI)
+  list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY})
 endif()
 
 if(WITH_IMAGEIO)

modules/highgui/src/cap_pvapi.cpp

@@ -57,7 +57,12 @@
 #endif
 
 #include <PvApi.h>
-#include <unistd.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif
+
 #include <string>
 //#include <arpa/inet.h>
 
@@ -86,23 +91,22 @@ public:
     }
 
 protected:
+#ifndef WIN32
     virtual void Sleep(unsigned int time);
+#endif
 
     typedef struct
     {
         unsigned long   UID;
         tPvHandle       Handle;
         tPvFrame        Frame;
-
-
     } tCamera;
+
     IplImage *frame;
     IplImage *grayframe;
     tCamera  Camera;
     tPvErr   Errcode;
     bool monocrome;
-
-
 };
 
 
@@ -111,6 +115,8 @@ CvCaptureCAM_PvAPI::CvCaptureCAM_PvAPI()
     monocrome=false;
     memset(&this->Camera, 0, sizeof(this->Camera));
 }
+
+#ifndef WIN32
 void CvCaptureCAM_PvAPI::Sleep(unsigned int time)
 {
     struct timespec t,r;
@@ -121,6 +127,8 @@ void CvCaptureCAM_PvAPI::Sleep(unsigned int time)
     while(nanosleep(&t,&r)==-1)
         t = r;
 }
+#endif
+
 void CvCaptureCAM_PvAPI::close()
 {
     // Stop the acquisition & free the camera
@@ -366,9 +374,4 @@ CvCapture* cvCreateCameraCapture_PvAPI( int index )
     delete capture;
     return NULL;
 }
-
-#ifdef _MSC_VER
-#pragma comment(lib, "PvAPI.lib")
-#endif
-
 #endif