Skip to content

O
opencv
Commit 9c04db55 authored by Philippe FOUBERT's avatar Philippe FOUBERT
Browse files
Options

Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS

parent 639450ef
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmake/OpenCVFindLibsVideo.cmake
View file @ 9c04db55
...@@ -60,7 +60,7 @@ if(WITH_PVAPI) ...@@ -60,7 +60,7 @@ if(WITH_PVAPI)
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
set(PVAPI_DECLARATIONS "-DPVDECL=__stdcall") set(PVAPI_DEFINITIONS "-DPVDECL=__stdcall")
endif(MINGW) endif(MINGW)
set(PVAPI_LIBRARY "${_PVAPI_LIBRARY}/PvAPI.lib" CACHE PATH "The PvAPI library") set(PVAPI_LIBRARY "${_PVAPI_LIBRARY}/PvAPI.lib" CACHE PATH "The PvAPI library")
else(WIN32) else(WIN32)
......
modules/highgui/CMakeLists.txt
View file @ 9c04db55
...@@ -197,7 +197,7 @@ endif(HAVE_FFMPEG) ...@@ -197,7 +197,7 @@ endif(HAVE_FFMPEG)
if(HAVE_PVAPI) if(HAVE_PVAPI)
add_definitions(-DHAVE_PVAPI) add_definitions(-DHAVE_PVAPI)
add_definitions(${PVAPI_DECLARATIONS}) add_definitions(${PVAPI_DEFINITIONS})
ocv_include_directories(${PVAPI_INCLUDE_PATH}) ocv_include_directories(${PVAPI_INCLUDE_PATH})
set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs}) set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs})
list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY}) list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment