CMakeLists.txt.patch

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

Download (2.8 kB)

 
/CMakeLists.txt (Modified) Fri May 11 13:58:57 2012
116 116
OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
117 117
OCV_OPTION(WITH_OPENNI         "Include OpenNI support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
118 118
OCV_OPTION(WITH_PNG            "Include PNG support"                         ON   IF (NOT IOS) )
119
OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (UNIX AND NOT ANDROID AND NOT IOS) )
119
OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (NOT APPLE AND NOT ANDROID AND NOT IOS) )
120 120
OCV_OPTION(WITH_QT             "Build with Qt Backend support"               OFF  IF (NOT ANDROID AND NOT IOS) )
121 121
OCV_OPTION(WITH_QUICKTIME      "Use QuickTime for Video I/O insted of QTKit" OFF  IF APPLE )
122 122
OCV_OPTION(WITH_TBB            "Include Intel TBB support"                   OFF  IF (NOT IOS) )
......
307 307

  
308 308
#Graphic libraries
309 309
set(HAVE_OPENGL 0)
310
if(NOT APPLE)
311
    if(WITH_PVAPI)
312
	    set(PVAPI_DEFAULT_INCLUDE_DIRS "/usr/local/include" "/usr/include" "C:/Program Files/Allied Vision Technologies/GigESDK/inc-pc")
313
        find_path(PVAPI_INCLUDE_DIR "PvApi.h"
314
                PATHS ${PVAPI_DEFAULT_INCLUDE_DIRS}
315
                DOC "The path to PvAPI header")
316
		include_directories(${PVAPI_INCLUDE_DIR})
317
	    if(PVAPI_INCLUDE_DIR)
318
			if(WIN32)
319
				get_filename_component(_PVAPI_LIB_PATH "${PVAPI_INCLUDE_DIR}/../lib-pc" ABSOLUTE)
320
				if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64|x86_64* OR MSVC64)
321
					set(_PVAPI_LIB_PATH "${_PVAPI_LIB_PATH}/x64")
322
				endif()
323
                set(PVAPI_LIB_DIR "${_PVAPI_LIB_PATH}" CACHE PATH "The path to PvAPI library")
324
				link_directories(${PVAPI_LIB_DIR})
325
			endif()
326
			set(HAVE_PVAPI 1)
327
		endif()
328
    endif()
329
endif()
330
	
310 331
if(UNIX)
311 332
    if(NOT APPLE)
312 333
      if(WITH_GTK)
......
346 367
      set(HAVE_UNICAP FALSE)
347 368
    endif()
348 369

  
349
    if(WITH_PVAPI)
350
      find_path(PVAPI_INCLUDE_PATH "PvApi.h"
351
                PATHS "/usr/local/include" "/usr/include"
352
                DOC "The path to PvAPI header")
353
      if(PVAPI_INCLUDE_PATH)
354
        set(HAVE_PVAPI 1)
355
      endif()
356
    endif()
357

  
358 370
    set(HAVE_FFMPEG 0)
359 371
    if(WITH_FFMPEG)
360 372
      CHECK_MODULE(libavcodec HAVE_FFMPEG_CODEC)
......
820 832
  else()
821 833
    set(HAVE_CAMV4L_STR "NO")
822 834
  endif()
823
 if(HAVE_CAMV4L2)
835
  if(HAVE_CAMV4L2)
824 836
    set(HAVE_CAMV4L2_STR "YES")
825 837
  else()
826 838
    set(HAVE_CAMV4L2_STR "NO")
......
843 855
  endif()
844 856
elseif(WIN32)
845 857
  status("  Video I/O:"      HAVE_VIDEOINPUT     THEN DirectShow ELSE NO)
858
  status("    PvAPI:"        HAVE_PVAPI          THEN YES ELSE NO)
846 859
endif()
847 860

  
848 861
if(WIN32)