Add aviex camera

parent b71fbe05
......@@ -106,3 +106,6 @@
[submodule "third-party/gldisplay"]
path = third-party/gldisplay
url = git://github.com/esrf-bliss/gldisplay.git
[submodule "camera/aviex"]
path = camera/aviex
url = git://github.com/esrf-bliss/Lima-camera-aviex.git
......@@ -606,6 +606,28 @@ $(call lib-full,$(rayonixhs-name),$(rayonixhs-ver)): $(rayonixhs-objs)
build_targets += $(call lib-full,$(rayonixhs-name),$(rayonixhs-ver))
endif
############################
# LIMA - AVIEX
############################
ifneq ($(COMPILE_AVIEX),0)
AVIEX_LDFLAGS := $(LDFLAGS) -L../camera/aviex/sdk/linux/lib
AVIEX_LDLIBS := $(LDLIBS) -lMx
aviex-name := aviex
aviex-objs := ../camera/aviex/src/Aviex.o
aviex-ver := ../camera/aviex/VERSION
aviex-flags := $(AVIEX_LDFLAGS)
aviex-deps := $(AVIEX_LDLIBS)
$(call lib-full,$(aviex-name),$(aviex-ver)): $(aviex-objs)
$(call compile-lib,$(aviex-name),$(aviex-ver),\
$(aviex-flags),$(aviex-deps),$@,$+)
$(call create-links,$(aviex-name),$(aviex-ver))
build_targets += $(call lib-full,$(aviex-name),$(aviex-ver))
endif
src: $(build_targets)
......
......@@ -176,4 +176,12 @@ ifneq ($(COMPILE_RAYONIXHS),0)
sub-dirs += rayonixhs
endif
ifndef COMPILE_AVIEX
COMPILE_AVIEX = 0
endif
ifneq ($(COMPILE_AVIEX),0)
sub-dirs += aviex
endif
include ../global.inc
Subproject commit 64c6e57d85017cc39ddc92b29aabe2648620e180
......@@ -46,6 +46,7 @@ COMPILE_POINTGREY=0
COMPILE_IMXPAD=0
COMPILE_DEXELA=0
COMPILE_RAYONIXHS=0
COMPILE_AVIEX=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -59,7 +60,7 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XSPRESS3 COMPILE_ULTRA COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_CONFIG\
COMPILE_GLDISPLAY \
LINK_STRICT_VERSION
......@@ -193,6 +193,12 @@ RAYONIXHS_FULL_VERSION = $(shell cat camera/rayonixhs/VERSION)
INSTALL_RAYONIXHS_VDIR = $(INSTALL_RAYONIXHS_DIR)/v$(RAYONIXHS_FULL_VERSION)
endif
ifneq ($(COMPILE_AVIEX), 0)
INSTALL_AVIEX_DIR = $(INSTALL_PLAT_DIR)/Aviex
AVIEX_FULL_VERSION = $(shell cat camera/aviex/VERSION)
INSTALL_AVIEX_VDIR = $(INSTALL_AVIEX_DIR)/v$(AVIEX_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -499,6 +505,17 @@ ifneq ($(COMPILE_RAYONIXHS), 0)
cp camera/rayonixhs/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_AVIEX), 0)
mkdir -p $(INSTALL_AVIEX_VDIR)
cp camera/aviex/python/__init__.py $(INSTALL_AVIEX_DIR)
$(call install_core_dep,$(INSTALL_AVIEX_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimaaviex.so*
cp -d build/liblimaaviex.so* $(INSTALL_LIB_DIR)
cp sip/aviex/limaaviex.so $(INSTALL_AVIEX_VDIR)
#cp camera/aviex/sdk/linux/lib/libMx.so.1 $(INSTALL_LIB_DIR)/libMx.so.1
cp camera/aviex/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_GLDISPLAY), 0)
mkdir -p $(INSTALL_GLDISPLAY_VDIR)
cp third-party/gldisplay/python/__init__.py $(INSTALL_GLDISPLAY_DIR)
......
......@@ -28,6 +28,7 @@ pilatus
pointgrey
dexela
rayonixhs
aviex
*.obj
lima*.exp
lima*.lib
......
......@@ -113,6 +113,10 @@ ifneq ($(COMPILE_RAYONIXHS), 0)
sip-modules += rayonixhs
endif
ifneq ($(COMPILE_AVIEX), 0)
sip-modules += aviex
endif
all: src
src:
......
......@@ -56,6 +56,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('dexela', [os.path.join('camera','dexela')]),
('xspress3', [os.path.join('camera','xspress3')]),
('rayonixhs', [os.path.join('camera','rayonixhs')]),
('aviex', [os.path.join('camera','aviex')]),
('ultra', [os.path.join('camera','ultra')]),
]
......@@ -185,6 +186,8 @@ def main():
extraIncludes += ['/usr/include/flycapture']
elif(modName == 'rayonixhs'):
extraIncludes += ['/opt/rayonix/include/craydl','/opt/rayonix/include','/opt/rayonix/include/marccd']
elif(modName == 'aviex'):
extra_cxxflags += ['-DOS_UNIX']
extraIncludes += findModuleIncludes(modName)
sipFile = open(sipFileName,"a")
......
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