generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS

Browse Source
This commit is contained in:
Philippe FOUBERT 2013-07-20 15:03:30 +02:00
parent 639450efdc
commit 9c04db554f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsVideo.cmake
View File

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

2
modules/highgui/CMakeLists.txt
View File

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