Commit 08a24189 authored by claustre's avatar claustre

Added support for the new Andor submodule and python sip as well.

parent 27d54e6b
......@@ -380,6 +380,35 @@ build_targets += $(mythen-full)
endif
############################
# LIMA - ANDOR
############################
ifneq ($(COMPILE_ANDOR),0)
ANDOR_LDFLAGS := -L. -L/usr/local/lib
ANDOR_LDLIBS := -landor
name := andor
andor-objs := ../camera/andor/src/Andor.o
version-file := ../camera/andor/VERSION
andor-flags := $(ANDOR_LDFLAGS)
andor-deps := $(ANDOR_LDLIBS)
andor-base := liblima$(name).so
full-version := $(shell cat $(version-file))
maj-version := $(shell echo $(full-version) | cut -f1 -d.)
andor-full := $(andor-base).$(full-version)
andor-maj := $(andor-base).$(maj-version)
andor-flags += -fPIC -Wl,-soname,$(andor-maj)
$(andor-full): $(andor-objs)
$(CXX) -shared -o $@ $(andor-flags) $+ $(andor-deps)
rm -f $(andor-maj); ln -s $(andor-full) $(andor-maj)
rm -f $(andor-base); ln -s $(andor-maj) $(andor-base)
build_targets += $(andor-full)
endif
src: $(build_targets)
test:
......
......@@ -92,4 +92,8 @@ ifneq ($(COMPILE_UEYE),0)
sub-dirs += ueye
endif
ifneq ($(COMPILE_ANDOR),0)
sub-dirs += andor
endif
include ../global.inc
andor @ c8c3d341
Subproject commit ba3bdda8a4d795d899de366dc4e84487fdc24f11
Subproject commit c8c3d341bf3c676a9773a874e327dfd9ecf2c77e
......@@ -34,10 +34,11 @@ COMPILE_MYTHEN=0
COMPILE_ADSC=0
COMPILE_UEYE=0
COMPILE_PERKINELMER=0
COMPILE_ANDOR=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=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_PERKINELMER COMPILE_CBF_SAVING COMPILE_NXS_SAVING
COMPILE_MYTHEN COMPILE_UEYE COMPILE_PERKINELMER COMPILE_ANDOR COMPILE_CBF_SAVING COMPILE_NXS_SAVING
......@@ -128,6 +128,13 @@ UEYE_MAJ_VERSION = $(shell echo $(UEYE_FULL_VERSION) | cut -d. -f1)
INSTALL_UEYE_VDIR = $(INSTALL_UEYE_DIR)/v$(UEYE_FULL_VERSION)
endif
ifneq ($(COMPILE_ANDOR), 0)
INSTALL_ANDOR_DIR = $(INSTALL_PLAT_DIR)/Andor
ANDOR_FULL_VERSION = $(shell cat camera/andor/VERSION)
ANDOR_MAJ_VERSION = $(shell echo $(ANDOR_FULL_VERSION) | cut -d. -f1)
INSTALL_ANDOR_VDIR = $(INSTALL_ANDOR_DIR)/v$(ANDOR_FULL_VERSION)
endif
.PHONY: install
PROCESSOR_TYPE := $(shell uname -i)
......@@ -253,4 +260,12 @@ ifneq ($(COMPILE_UEYE), 0)
cp build/liblimaueye.so.$(UEYE_FULL_VERSION) $(INSTALL_LIB_DIR)
cp -d build/liblimaueye.so.$(UEYE_MAJ_VERSION) $(INSTALL_LIB_DIR)
cp sip/ueye/limaueye.so $(INSTALL_UEYE_VDIR)
endif
\ No newline at end of file
endif
ifneq ($(COMPILE_ANDOR), 0)
mkdir -p $(INSTALL_ANDOR_VDIR)
cp camera/andor/python/__init__.py $(INSTALL_ANDOR_DIR)
rm -rf $(INSTALL_LIB_DIR)/liblimaandor.so*
cp build/liblimaandor.so.$(ANDOR_FULL_VERSION) $(INSTALL_LIB_DIR)
cp -d build/liblimaandor.so.$(ANDOR_MAJ_VERSION) $(INSTALL_LIB_DIR)
cp sip/andor/limaandor.so $(INSTALL_ANDOR_VDIR)
endif
......@@ -67,6 +67,10 @@ ifneq ($(COMPILE_UEYE), 0)
sip-modules += ueye
endif
ifneq ($(COMPILE_ANDOR), 0)
sip-modules += andor
endif
all: src
src:
......
......@@ -40,6 +40,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('adsc', [os.path.join('camera','adsc')]),
('mythen', [os.path.join('camera','mythen')]),
('perkinelmer', [os.path.join('camera','perkinelmer')]),
('andor', [os.path.join('camera','andor')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......@@ -143,6 +144,8 @@ def main():
extra_cxxflags += ['-DUSE_GIGE']
elif(modName == 'ueye') and platform.system() != 'Windows':
extra_cxxflags += ['-D__LINUX__']
elif(modName == 'andor') :
extraIncludes += ['/usr/local/include']
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