Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS

pull/1076/head
Philippe FOUBERT 12 years ago
parent 639450efdc
commit 9c04db554f
  1. 2
      cmake/OpenCVFindLibsVideo.cmake
  2. 2
      modules/highgui/CMakeLists.txt

@ -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)

@ -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})

Loading…
Cancel
Save