CMakeLists.txt.patch

Erich Michler, 2012-05-14 08:36 am

Download (1.9 kB)

 
/modules/highgui/CMakeLists.txt (Modified) Fri May 11 14:21:44 2012
93 93
  endif()
94 94
endif()
95 95

  
96
if(NOT APPLE)
97
  if(HAVE_PVAPI)
98
    add_definitions(-DHAVE_PVAPI)
99
    ocv_include_directories(${PVAPI_INCLUDE_PATH})
100
    if(X86)
101
      set(PVAPI_SDK_SUBDIR x86)
102
    elseif(X86_64)
103
      set(PVAPI_SDK_SUBDIR x64)
104
    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
105
      set(PVAPI_SDK_SUBDIR arm)
106
    endif()
107
    if(PVAPI_SDK_SUBDIR AND CMAKE_COMPILER_IS_GNUCXX)
108
      get_filename_component(PVAPI_EXPECTED_LIB_PATH "${PVAPI_INCLUDE_PATH}/../lib-pc/${PVAPI_SDK_SUBDIR}/${CMAKE_OPENCV_GCC_VERSION_MAJOR}.${CMAKE_OPENCV_GCC_VERSION_MINOR}" ABSOLUTE)
109
      link_directories(${PVAPI_EXPECTED_LIB_PATH})
110
    endif()
111
    set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs})
112
    set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} PvAPI)
113
  endif()
114
endif()
115

  
96 116
if(UNIX)
97 117
  if(NOT HAVE_QT)        
98 118
    if(HAVE_GTK)
......
118 138
    endif()
119 139
  endif()
120 140
    
121
  if(HAVE_PVAPI)
122
    add_definitions(-DHAVE_PVAPI)
123
    ocv_include_directories(${PVAPI_INCLUDE_PATH})
124
    if(X86)
125
      set(PVAPI_SDK_SUBDIR x86)
126
    elseif(X86_64)
127
      set(PVAPI_SDK_SUBDIR x64)
128
    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
129
      set(PVAPI_SDK_SUBDIR arm)
130
    endif()
131
    if(PVAPI_SDK_SUBDIR AND CMAKE_COMPILER_IS_GNUCXX)
132
      get_filename_component(PVAPI_EXPECTED_LIB_PATH "${PVAPI_INCLUDE_PATH}/../lib-pc/${PVAPI_SDK_SUBDIR}/${CMAKE_OPENCV_GCC_VERSION_MAJOR}.${CMAKE_OPENCV_GCC_VERSION_MINOR}" ABSOLUTE)
133
      link_directories(${PVAPI_EXPECTED_LIB_PATH})
134
    endif()
135
    set(highgui_srcs src/cap_pvapi.cpp ${highgui_srcs})
136
    set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} PvAPI)
137
  endif()
138

  
139 141
  if(HAVE_GSTREAMER)
140 142
    set(highgui_srcs ${highgui_srcs} src/cap_gstreamer.cpp)
141 143
  endif()