diff options
| author | Matthias Vogelgesang <matthias@ipepdvpc2> | 2011-03-04 16:35:32 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias@ipepdvpc2> | 2011-03-04 16:35:32 +0100 |
| commit | 9abc67deeb2912b54d8015bf11247adc36fc6247 (patch) | |
| tree | 6d017e821a63e2b6426403104d96ef61cd574bc1 | |
| parent | ba34fc549873b52f4c78e44c1f71adfc2980bf48 (diff) | |
| download | uca-9abc67deeb2912b54d8015bf11247adc36fc6247.tar.gz uca-9abc67deeb2912b54d8015bf11247adc36fc6247.tar.bz2 uca-9abc67deeb2912b54d8015bf11247adc36fc6247.tar.xz uca-9abc67deeb2912b54d8015bf11247adc36fc6247.zip | |
Integrate photon focus libraries
| -rw-r--r-- | cmake/FindPF.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/cmake/FindPF.cmake b/cmake/FindPF.cmake index 1e5feae..090225d 100644 --- a/cmake/FindPF.cmake +++ b/cmake/FindPF.cmake @@ -9,7 +9,7 @@ find_package(PackageHandleStandardArgs) find_path(PF_INCLUDE_DIRS libpf/pfcam.h) -find_library(PF_LIBRARIES libcomdll libmv2_d1280_64) +find_library(PF_LIBRARIES NAMES comdll mv2_d1280_640) find_package_handle_standard_args(PF DEFAULT_MSG PF_LIBRARIES PF_INCLUDE_DIRS) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 835d1a5..33e7b5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,6 +24,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # --- Find camera interfaces find_package(PCO) +find_package(PF) # --- Find frame grabber interfaces find_package(FgLib5) @@ -32,12 +33,23 @@ find_package(ClSerMe4) # --- Add sources if camera/framegrabber access sources are available --------- # FIXME: create some kind of libphoton and search for it -set(HAVE_PHOTON_FOCUS TRUE) -if(HAVE_PHOTON_FOCUS) +if (PF_FOUND) + set(HAVE_PHOTON_FOCUS TRUE) + set(uca_SRCS ${uca_SRCS} cameras/pf.c ) + + set(uca_LIBS + ${uca_LIBS} + ${PF_LIBRARIES} + ) + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${PF_INCLUDE_DIRS} + ) endif() if(PCO_FOUND) |