Commit de494259 authored by Andreas Persson's avatar Andreas Persson Committed by Sebastien Petitdemange

add pointgrey plugin

parent f1ae7de0
......@@ -85,3 +85,6 @@
[submodule "third-party/libconfig"]
path = third-party/libconfig
url = git://github.com/esrf-bliss/libconfig.git
[submodule "camera/pointgrey"]
path = camera/pointgrey
url = git://github.com/esrf-bliss/Lima-camera-pointgrey.git
......@@ -445,6 +445,29 @@ build_targets += $(call lib-full,$(pilatus-name),$(pilatus-ver))
endif
############################
# LIMA - POINTGREY
############################
ifneq ($(COMPILE_POINTGREY),0)
POINTGREY_LDFLAGS := $(LDFLAGS)
POINTGREY_LDLIBS := $(LDLIBS) -lflycapture
pointgrey-name := pointgrey
pointgrey-objs := ../camera/pointgrey/src/PointGrey.o
pointgrey-ver := ../camera/pointgrey/VERSION
pointgrey-flags := $(POINTGREY_LDFLAGS)
pointgrey-deps := $(POINTGREY_LDLIBS)
$(call lib-full,$(pointgrey-name),$(pointgrey-ver)): $(pointgrey-objs)
$(call compile-lib,$(pointgrey-name),$(pointgrey-ver),\
$(pointgrey-flags),$(pointgrey-deps),$@,$+)
$(call create-links,$(pointgrey-name),$(pointgrey-ver))
build_targets += $(call lib-full,$(pointgrey-name),$(pointgrey-ver))
endif
src: $(build_targets)
test:
......
......@@ -128,4 +128,12 @@ ifneq ($(COMPILE_PILATUS),0)
sub-dirs += pilatus
endif
ifndef COMPILE_POINTGREY
COMPILE_POINTGREY = 0
endif
ifneq ($(COMPILE_POINTGREY),0)
sub-dirs += pointgrey
endif
include ../global.inc
Subproject commit 0b28f2d0ffc001a710e239e805a7105f3f31eeb4
......@@ -39,6 +39,7 @@ COMPILE_ANDOR=0
COMPILE_PHOTONICSCIENCE=0
COMPILE_PCO=0
COMPILE_MARCCD=0
COMPILE_POINTGREY=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -50,6 +51,6 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD \
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING \
COMPILE_PCO COMPILE_EDFGZ_SAVING COMPILE_CONFIG\
COMPILE_POINTGREY COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_PCO COMPILE_EDFGZ_SAVING COMPILE_CONFIG\
LINK_STRICT_VERSION
......@@ -157,6 +157,12 @@ MARCCD_FULL_VERSION = $(shell cat camera/marccd/VERSION)
INSTALL_MARCCD_VDIR = $(INSTALL_MARCCD_DIR)/v$(MARCCD_FULL_VERSION)
endif
ifneq ($(COMPILE_POINTGREY), 0)
INSTALL_POINTGREY_DIR = $(INSTALL_PLAT_DIR)/PointGrey
POINTGREY_FULL_VERSION = $(shell cat camera/pointgrey/VERSION)
INSTALL_POINTGREY_VDIR = $(INSTALL_POINTGREY_DIR)/v$(POINTGREY_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -387,3 +393,13 @@ ifneq ($(COMPILE_MARCCD), 0)
cp camera/marccd/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_POINTGREY), 0)
mkdir -p $(INSTALL_POINTGREY_VDIR)
cp camera/pointgrey/python/__init__.py $(INSTALL_POINTGREY_DIR)
$(call install_core_dep,$(INSTALL_POINTGREY_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimapointgrey.so*
cp -d build/liblimapointgrey.so* $(INSTALL_LIB_DIR)
cp sip/pointgrey/limapointgrey.so $(INSTALL_POINTGREY_VDIR)
cp camera/pointgrey/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -23,6 +23,7 @@ xpad
photonicscience
marccd
pilatus
pointgrey
*.obj
lima*.exp
lima*.lib
......
......@@ -83,6 +83,10 @@ ifneq ($(COMPILE_PILATUS), 0)
sip-modules += pilatus
endif
ifneq ($(COMPILE_POINTGREY), 0)
sip-modules += pointgrey
endif
all: src
src:
......
......@@ -45,6 +45,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('marccd', [os.path.join('camera','marccd')]),
('photonicscience', [os.path.join('camera','photonicscience')]),
('pilatus', [os.path.join('camera','pilatus')]),
('pointgrey', [os.path.join('camera','pointgrey')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......@@ -162,6 +163,8 @@ def main():
elif(modName == 'marccd'):
extraIncludes += ['../../../include/DiffractionImage']
extraIncludes += ['../../third-party/yat/include']
elif(modName == 'pointgrey'):
extraIncludes += ['/usr/include/flycapture']
extraIncludes += findModuleIncludes(modName)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment