Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
authorPhilippe FOUBERT <philippe.foubert@free.fr>
Sat, 20 Jul 2013 13:03:30 +0000 (15:03 +0200)
committerPhilippe FOUBERT <philippe.foubert@free.fr>
Sat, 20 Jul 2013 13:03:30 +0000 (15:03 +0200)
cmake/OpenCVFindLibsVideo.cmake
modules/highgui/CMakeLists.txt

index da61ad1..b7c8382 100644 (file)
@@ -60,7 +60,7 @@ if(WITH_PVAPI)
 
     if(WIN32)
       if(MINGW)
-        set(PVAPI_DECLARATIONS "-DPVDECL=__stdcall")
+        set(PVAPI_DEFINITIONS "-DPVDECL=__stdcall")
       endif(MINGW)
       set(PVAPI_LIBRARY "${_PVAPI_LIBRARY}/PvAPI.lib" CACHE PATH "The PvAPI library")
     else(WIN32)
index 8e29098..834eb82 100644 (file)
@@ -197,7 +197,7 @@ endif(HAVE_FFMPEG)
 
 if(HAVE_PVAPI)
   add_definitions(-DHAVE_PVAPI)
-  add_definitions(${PVAPI_DECLARATIONS})
+  add_definitions(${PVAPI_DEFINITIONS})
   ocv_include_directories(${PVAPI_INCLUDE_PATH})
   set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs})
   list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY})