Commit 71c6fef8 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Operator for ID00

Merge 'gitlab/master' and 'github.bliss/master' branches

parents 89daff09 bbe225a3
......@@ -941,6 +941,34 @@ build_targets += $(slsdetector-libfull)
endif
##########################
# LIMA - LAMBDA
############################
ifneq ($(COMPILE_LAMBDA),0)
LAMBDA_LDFLAGS := -L$(LAMBDA_DIR)/sdk/bin
LAMBDA_LDLIBS := -llambda
lambda-name := lambda
lambda-objs := ../camera/lambda/src/Lambda.o
lambda-ver := ../camera/lambda/VERSION
lambda-flags := $(LDFLAGS) $(LAMBDA_LDFLAGS)
lambda-libs := $(LDLIBS) $(LAMBDA_LDLIBS)
lambda-deps := $(DEPLIBS)
lambda-libdeps := $(call lib-deps,$(lambda-deps))
lambda-libfull := $(call lib-full,$(lambda-name),$(lambda-ver))
$(lambda-libfull): $(lambda-objs) $(lambda-libdeps)
$(call compile-lib,$(lambda-name),$(lambda-ver),\
$(lambda-deps),\
$(lambda-flags),$(lambda-libs),$@,\
$(lambda-objs))
$(call create-links,$(lambda-name),$(lambda-ver))
build_targets += $(lambda-libfull)
endif
src: $(build_targets)
......
......@@ -259,4 +259,12 @@ ifneq ($(COMPILE_SLSDETECTOR),0)
sub-dirs += slsdetector
endif
ifndef COMPILE_LAMBDA
COMPILE_LAMBDA = 0
endif
ifneq ($(COMPILE_LAMBDA),0)
sub-dirs += lambda
endif
include ../global.inc
......@@ -56,6 +56,7 @@ COMPILE_EIGER=0
COMPILE_PIXIRAD=0
COMPILE_HEXITEC=0
COMPILE_SLSDETECTOR=0
COMPILE_LAMBDA=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -73,7 +74,7 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_MYTHEN COMPILE_MYTHEN3 COMPILE_HEXITEC \
COMPILE_ANDOR COMPILE_ANDOR3 COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA \
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_META COMPILE_MERLIN COMPILE_V4l2 COMPILE_EIGER COMPILE_PIXIRAD \
COMPILE_SLSDETECTOR \
COMPILE_SLSDETECTOR COMPILE_LAMBDA \
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_EDFLZ4_SAVING COMPILE_TIFF_SAVING \
COMPILE_HDF5_SAVING COMPILE_CONFIG COMPILE_GLDISPLAY \
LINK_STRICT_VERSION
......@@ -259,6 +259,12 @@ SLSDETECTOR_FULL_VERSION = $(shell cat camera/slsdetector/VERSION)
INSTALL_SLSDETECTOR_VDIR = $(INSTALL_SLSDETECTOR_DIR)/v$(SLSDETECTOR_FULL_VERSION)
endif
ifneq ($(COMPILE_LAMBDA), 0)
INSTALL_LAMBDA_DIR = $(INSTALL_PLAT_DIR)/Lambda
LAMBDA_FULL_VERSION = $(shell cat camera/lambda/VERSION)
INSTALL_LAMBDA_VDIR = $(INSTALL_LAMBDA_DIR)/v$(LAMBDA_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -692,3 +698,13 @@ ifneq ($(COMPILE_SLSDETECTOR), 0)
cp sip/slsdetector/limaslsdetector.so $(INSTALL_SLSDETECTOR_VDIR)
cp camera/slsdetector/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_LAMBDA), 0)
mkdir -p $(INSTALL_LAMBDA_VDIR)
cp camera/lambda/python/__init__.py $(INSTALL_LAMBDA_DIR)
$(call install_core_dep,$(INSTALL_LAMBDA_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimalambda.so*
cp -d build/liblimalambda.so* $(INSTALL_LIB_DIR)
cp sip/lambda/limalambda.so $(INSTALL_LAMBDA_VDIR)
cp camera/lambda/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -157,6 +157,9 @@ ifneq ($(COMPILE_SLSDETECTOR), 0)
sip-modules += slsdetector
endif
ifneq ($(COMPILE_LAMBDA), 0)
sip-modules += lambda
endif
all: src
......
......@@ -67,6 +67,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('eiger', [os.path.join('camera','eiger')]),
('hexitec', [os.path.join('camera','hexitec')]),
('slsdetector', [os.path.join('camera','slsdetector')]),
('lambda', [os.path.join('camera','lambda')]),
]
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