Move Pilatus from python to c++

parent 12855972
......@@ -418,6 +418,29 @@ build_targets += $(call lib-full,$(xpad-name),$(xpad-ver))
endif
############################
# LIMA - PILATUS
############################
ifneq ($(COMPILE_PILATUS),0)
PILATUS_LDLIBS :=
pilatus-name := pilatus
pilatus-objs := ../camera/pilatus/src/Pilatus.o
pilatus-ver := ../camera/pilatus/VERSION
pilatus-flags := $(LDFLAGS)
pilatus-deps := $(PILATUS_LDLIBS)
$(call lib-full,$(pilatus-name),$(pilatus-ver)): $(pilatus-objs)
$(call compile-lib,$(pilatus-name),$(pilatus-ver),\
$(pilatus-flags),$(pilatus-deps),$@,$+)
$(call create-links,$(pilatus-name),$(pilatus-ver))
build_targets += $(call lib-full,$(pilatus-name),$(pilatus-ver))
endif
src: $(build_targets)
test:
......
......@@ -120,4 +120,12 @@ ifneq ($(COMPILE_MARCCD),0)
sub-dirs += marccd
endif
ifndef COMPILE_PILATUS
COMPILE_PILATUS = 0
endif
ifneq ($(COMPILE_PILATUS),0)
sub-dirs += pilatus
endif
include ../global.inc
Subproject commit 77a68b5b49acc3c7eaf3ca4f3b9bece404895081
Subproject commit f299a6dec9a5662792011c7bcb76f59b662ce7d7
......@@ -48,7 +48,7 @@ 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_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_MARCCD \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD \
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING \
COMPILE_PCO COMPILE_EDFGZ_SAVING\
LINK_STRICT_VERSION
......@@ -270,7 +270,9 @@ ifneq ($(COMPILE_PILATUS), 0)
mkdir -p $(INSTALL_PILATUS_VDIR)
cp camera/pilatus/python/__init__.py $(INSTALL_PILATUS_DIR)
$(call install_core_dep,$(INSTALL_PILATUS_VDIR))
cp camera/pilatus/python/*.py $(INSTALL_PILATUS_VDIR)
rm -rf $(INSTALL_LIB_DIR)/liblimapilatus.so*
cp -d build/liblimapilatus.so* $(INSTALL_LIB_DIR)
cp sip/pilatus/limapilatus.so $(INSTALL_PILATUS_VDIR)
cp camera/pilatus/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_BASLER), 0)
......
......@@ -22,6 +22,7 @@ andor
xpad
photonicscience
marccd
pilatus
*.obj
lima*.exp
lima*.lib
......
......@@ -79,6 +79,10 @@ ifneq ($(COMPILE_MARCCD), 0)
sip-modules += marccd
endif
ifneq ($(COMPILE_PILATUS), 0)
sip-modules += pilatus
endif
all: src
src:
......
......@@ -44,6 +44,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('xpad', [os.path.join('camera','xpad')]),
('marccd', [os.path.join('camera','marccd')]),
('photonicscience', [os.path.join('camera','photonicscience')]),
('pilatus', [os.path.join('camera','pilatus')]),
]
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