Commit 1165575f authored by Geoffrey Mant's avatar Geoffrey Mant Committed by Sebastien Petitdemange

Added xspress3

parent 532a8a8a
......@@ -97,3 +97,6 @@
[submodule "camera/dexela"]
path = camera/dexela
url = git://github.com/esrf-bliss/Lima-camera-dexela.git
[submodule "camera/xspress3"]
path = camera/xspress3
url = git://github.com/esrf-bliss/Lima-camera-xspress3
Subproject commit c0c7cb20ca78f8ee4b30d5aaffcb3236a6639829
Subproject commit 300cacaab8c27f79a14253426ead60a818fabbbc
......@@ -430,6 +430,35 @@ build_targets += $(call lib-full,$(xh-name),$(xh-ver))
endif
############################
# LIMA - XSPRESS3
############################
ifneq ($(COMPILE_XSPRESS3),0)
PROCESSOR_TYPE := $(shell uname -m)
ifeq ($(PROCESSOR_TYPE),x86_64)
XSPRESS3_LDFLAGS := -L../camera/xspress3/sdk/libs/linux.x86_64
else
XSPRESS3_LDFLAGS := -L../camera/xspress3/sdk/libs/linux.x86
endif
XSPRESS3_LDLIBS := -lxspress3 -limg_mod
xspress3-name := xspress3
xspress3-objs := ../camera/xspress3/src/Xspress3.o
xspress3-ver := ../camera/xspress3/VERSION
xspress3-flags := $(XSPRESS3_LDFLAGS) $(LDFLAGS)
xspress3-deps := $(XSPRESS3_LDLIBS) $(LDLIBS)
$(call lib-full,$(xspress3-name),$(xspress3-ver)): $(xspress3-objs)
$(call compile-lib,$(xspress3-name),$(xspress3-ver),\
$(xspress3-flags),$(xspress3-deps),$@,$+)
$(call create-links,$(xspress3-name),$(xspress3-ver))
build_targets += $(call lib-full,$(xspress3-name),$(xspress3-ver))
endif
############################
# LIMA - XPAD
############################
......
......@@ -104,10 +104,22 @@ ifneq ($(COMPILE_ANDOR),0)
sub-dirs += andor
endif
ifndef COMPILE_XH
COMPILE_XH = 0
endif
ifneq ($(COMPILE_XH),0)
sub-dirs += xh
endif
ifndef COMPILE_XSPRESS3
COMPILE_XSPRESS3 = 0
endif
ifneq ($(COMPILE_XSPRESS3),0)
sub-dirs += xspress3
endif
ifndef COMPILE_XPAD
COMPILE_XPAD = 0
endif
......
Subproject commit f0e80f8a6a6c01b0213dc50f7c109173573c1db5
......@@ -34,6 +34,7 @@ COMPILE_MYTHEN=0
COMPILE_ADSC=0
COMPILE_UEYE=0
COMPILE_XH=0
COMPILE_XSPRESS3=0
COMPILE_XPAD=0
COMPILE_PERKINELMER=0
COMPILE_ANDOR=0
......@@ -53,7 +54,7 @@ LINK_STRICT_VERSION=0
export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX COMPILE_PILATUS \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XSPRESS3 COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_CONFIG\
......
......@@ -151,6 +151,12 @@ XH_FULL_VERSION = $(shell cat camera/xh/VERSION)
INSTALL_XH_VDIR = $(INSTALL_XH_DIR)/v$(XH_FULL_VERSION)
endif
ifneq ($(COMPILE_XSPRESS3), 0)
INSTALL_XSPRESS3_DIR = $(INSTALL_PLAT_DIR)/Xspress3
XSPRESS3_FULL_VERSION = $(shell cat camera/xspress3/VERSION)
INSTALL_XSPRESS3_VDIR = $(INSTALL_XSPRESS3_DIR)/v$(XSPRESS3_FULL_VERSION)
endif
ifneq ($(COMPILE_XPAD), 0)
INSTALL_XPAD_DIR = $(INSTALL_PLAT_DIR)/Xpad
XPAD_FULL_VERSION = $(shell cat camera/xpad/VERSION)
......@@ -398,6 +404,16 @@ ifneq ($(COMPILE_XH), 0)
cp camera/xh/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_XSPRESS3), 0)
mkdir -p $(INSTALL_XSPRESS3_VDIR)
cp camera/xspress3/python/__init__.py $(INSTALL_XSPRESS3_DIR)
$(call install_core_dep,$(INSTALL_XSPRESS3_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimaxspress3.so*
cp -d build/liblimaxspress3.so* $(INSTALL_LIB_DIR)
cp sip/xspress3/limaxspress3.so $(INSTALL_XSPRESS3_VDIR)
cp camera/xspress3/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_XPAD), 0)
mkdir -p $(INSTALL_XPAD_VDIR)
cp camera/xpad/python/__init__.py $(INSTALL_XPAD_DIR)
......
......@@ -81,6 +81,10 @@ ifneq ($(COMPILE_XH), 0)
sip-modules += xh
endif
ifneq ($(COMPILE_XSPRESS3), 0)
sip-modules += xspress3
endif
ifneq ($(COMPILE_XPAD), 0)
sip-modules += xpad
endif
......
......@@ -54,6 +54,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('pointgrey', [os.path.join('camera','pointgrey')]),
('imxpad', [os.path.join('camera','imxpad')]),
('dexela', [os.path.join('camera','dexela')]),
('xspress3', [os.path.join('camera','xspress3')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......
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