Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS

diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake
index da61ad167ad6d88079338c3c26d64a433e45eb2c..b7c83828581a03c5253a8bf5ea4703d3d95759fe 100644 (file)
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -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)

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 8e2909843fd016583a26d24d5acf67ffe850c516..834eb821c72785a4d140cf59914aa58dbdcdde2b 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -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})