Add rayonixhs into Makefiles

parent 7c6bb533
......@@ -552,6 +552,29 @@ build_targets += $(call lib-full,$(imxpad-name),$(imxpad-ver))
endif
############################
# LIMA - RAYONIXHS
############################
ifneq ($(COMPILE_RAYONIXHS),0)
RAYONIXHS_LDFLAGS := $(LDFLAGS) -L../camera/rayonixhs/sdk/lib64
RAYONIXHS_LDLIBS := $(LDLIBS) -lcraydl
rayonixhs-name := rayonixhs
rayonixhs-objs := ../camera/rayonixhs/src/RayonixHs.o
rayonixhs-ver := ../camera/rayonixhs/VERSION
rayonixhs-flags := $(RAYONIXHS_LDFLAGS)
rayonixhs-deps := $(RAYONIXHS_LDLIBS)
$(call lib-full,$(rayonixhs-name),$(rayonixhs-ver)): $(rayonixhs-objs)
$(call compile-lib,$(rayonixhs-name),$(rayonixhs-ver),\
$(rayonixhs-flags),$(rayonixhs-deps),$@,$+)
$(call create-links,$(rayonixhs-name),$(rayonixhs-ver))
build_targets += $(call lib-full,$(rayonixhs-name),$(rayonixhs-ver))
endif
src: $(build_targets)
test:
......
......@@ -160,4 +160,12 @@ ifneq ($(COMPILE_IMXPAD),0)
sub-dirs += imxpad
endif
ifndef COMPILE_RAYONIXHS
COMPILE_RAYONIXHS = 0
endif
ifneq ($(COMPILE_RAYONIXHS),0)
sub-dirs += rayonixhs
endif
include ../global.inc
Subproject commit f05e70107963a5e8fe4f94b29bc1333dbf13fb86
Subproject commit d26a58fce730d35862a3110d6047a198dc599951
......@@ -44,6 +44,7 @@ COMPILE_MARCCD=0
COMPILE_POINTGREY=0
COMPILE_IMXPAD=0
COMPILE_DEXELA=0
COMPILE_RAYONIXHS=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -56,6 +57,6 @@ 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_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_CONFIG\
LINK_STRICT_VERSION
......@@ -181,6 +181,12 @@ IMXPAD_FULL_VERSION = $(shell cat camera/imxpad/VERSION)
INSTALL_IMXPAD_VDIR = $(INSTALL_IMXPAD_DIR)/v$(IMXPAD_FULL_VERSION)
endif
ifneq ($(COMPILE_RAYONIXHS), 0)
INSTALL_RAYONIXHS_DIR = $(INSTALL_PLAT_DIR)/RayonixHs
RAYONIXHS_FULL_VERSION = $(shell cat camera/rayonixhs/VERSION)
INSTALL_RAYONIXHS_VDIR = $(INSTALL_RAYONIXHS_DIR)/v$(RAYONIXHS_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -454,3 +460,17 @@ ifneq ($(COMPILE_IMXPAD), 0)
cp sip/imxpad/limaimxpad.so $(INSTALL_IMXPAD_VDIR)
cp camera/imxpad/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_RAYONIXHS), 0)
mkdir -p $(INSTALL_RAYONIXHS_VDIR)
cp camera/rayonixhs/python/__init__.py $(INSTALL_RAYONIXHS_DIR)
$(call install_core_dep,$(INSTALL_RAYONIXHS_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimarayonixhs.so*
cp -d build/liblimarayonixhs.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcraydl.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcraydl_gpu.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcbf.so* $(INSTALL_LIB_DIR)
cp -dr camera/rayonixhs/sdk/lib64/libcraydl_nocuda $(INSTALL_LIB_DIR)
cp sip/rayonixhs/limarayonixhs.so $(INSTALL_RAYONIXHS_VDIR)
cp camera/rayonixhs/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -27,6 +27,7 @@ marccd
pilatus
pointgrey
dexela
rayonixhs
*.obj
lima*.exp
lima*.lib
......
......@@ -105,6 +105,10 @@ ifneq ($(COMPILE_IMXPAD), 0)
sip-modules += imxpad
endif
ifneq ($(COMPILE_RAYONIXHS), 0)
sip-modules += rayonixhs
endif
all: src
src:
......
......@@ -55,6 +55,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('imxpad', [os.path.join('camera','imxpad')]),
('dexela', [os.path.join('camera','dexela')]),
('xspress3', [os.path.join('camera','xspress3')]),
('rayonixhs', [os.path.join('camera','rayonixhs')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......@@ -181,7 +182,8 @@ def main():
extraIncludes += ['../../third-party/yat/include']
elif(modName == 'pointgrey'):
extraIncludes += ['/usr/include/flycapture']
elif(modName == 'rayonixhs'):
extraIncludes += ['../../camera/rayonixhs/sdk/include/craydl']
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