Ticket #23: cmake_find_pflib.diff

File cmake_find_pflib.diff, 1.1 KB (added by Suren A. Chilingaryan, 14 years ago)

Proposed fix to find libpf

  • cmake/FindPF.cmake 

    === modified file 'cmake/FindPF.cmake'
     
    88
    99find_package(PackageHandleStandardArgs)
    1010
    11 find_path(PF_INCLUDE_DIRS libpf/pfcam.h)
    12 find_library(PF_LIBRARY_COMDLL NAMES comdll)
    13 find_library(PF_LIBRARY_MV2 NAMES mv2_d1280_640)
    14 find_library(PF_LIBRARY_PFCAM NAMES pfcam)
     11find_path(PF_ROOT_DIR src/pfcam.h PATHS ../../libpf64)
     12
     13find_path(PF_INCLUDE_DIRS pfcam.h PATHS ${PF_ROOT_DIR} PATH_SUFFIXES libpf src)
     14find_library(PF_LIBRARY_COMDLL NAMES comdll PATHS ${PF_ROOT_DIR}/libs)
     15find_library(PF_LIBRARY_MV2 NAMES mv2_d1280_640 PATHS ${PF_ROOT_DIR}/libs)
     16find_library(PF_LIBRARY_PFCAM NAMES pfcam PATHS ${PF_ROOT_DIR}/libs)
    1517
    1618set(PF_LIBRARIES ${PF_LIBRARY_MV2} ${PF_LIBRARY_PFCAM} ${PF_LIBRARY_COMDLL})
    1719

  • src/cameras/pf.c 

    === modified file 'src/cameras/pf.c'
     
    22#include <math.h>
    33#include <stdlib.h>
    44#include <string.h>
    5 #include <libpf/pfcam.h>
     5#include <pfcam.h>
    66#include "uca.h"
    77#include "uca-cam.h"
    88#include "uca-grabber.h"