Commit 51460ee5 authored by Geoffrey Mant's avatar Geoffrey Mant Committed by Sebastien Petitdemange

modify makefiles for merlin and mythen

Correct typo and and SIPCOMPILATION flag
parent 940fae0e
......@@ -20,4 +20,7 @@ install
*_test.py
~*vcproj
*.tmp
/.cproject
/.pydevproject
/.settings
......@@ -340,6 +340,28 @@ build_targets += $(call lib-full,$(adsc-name),$(adsc-ver))
endif
############################
# LIMA - MERLIN
############################
ifneq ($(COMPILE_MERLIN),0)
MERLIN_LDFLAGS := $(LDFLAGS)
MERLIN_LDLIBS := $(LDLIBS)
merlin-name := merlin
merlin-objs := ../camera/merlin/src/Merlin.o
merlin-ver := ../camera/merlin/VERSION
merlin-flags := $(MERLIN_LDFLAGS)
merlin-deps := $(MERLIN_LDLIBS)
$(call lib-full,$(merlin-name),$(merlin-ver)): $(merlin-objs)
$(call compile-lib,$(merlin-name),$(merlin-ver),\
$(merlin-flags),$(merlin-deps),$@,$+)
$(call create-links,$(merlin-name),$(merlin-ver))
build_targets += $(call lib-full,$(merlin-name),$(merlin-ver))
endif
############################
# LIMA - MYTHEN
......@@ -364,6 +386,28 @@ build_targets += $(call lib-full,$(mythen-name),$(mythen-ver))
endif
############################
# LIMA - MYTHEN3
############################
ifneq ($(COMPILE_MYTHEN3),0)
MYTHEN3_LDLIBS := $(LDLIBS)
mythen3-name := mythen3
mythen3-objs := ../camera/mythen3/src/Mythen3.o
mythen3-ver := ../camera/mythen3/VERSION
mythen3-flags := $(LDFLAGS)
mythen3-deps := $(MYTHEN3_LDLIBS)
$(call lib-full,$(mythen3-name),$(mythen3-ver)): $(mythen3-objs)
$(call compile-lib,$(mythen3-name),$(mythen3-ver),\
$(mythen3-flags),$(mythen3-deps),$@,$+)
$(call create-links,$(mythen3-name),$(mythen3-ver))
build_targets += $(call lib-full,$(mythen3-name),$(mythen3-ver))
endif
############################
# LIMA - ANDOR
......
......@@ -88,6 +88,14 @@ ifneq ($(COMPILE_MYTHEN),0)
sub-dirs += mythen
endif
ifndef COMPILE_MYTHEN3
COMPILE_MYTHEN3 = 0
endif
ifneq ($(COMPILE_MYTHEN3),0)
sub-dirs += mythen3
endif
ifndef COMPILE_UEYE
COMPILE_UEYE = 0
endif
......@@ -104,10 +112,6 @@ ifneq ($(COMPILE_ANDOR),0)
sub-dirs += andor
endif
ifndef COMPILE_XH
COMPILE_XH = 0
endif
ifndef COMPILE_ANDOR3
COMPILE_ANDOR3 = 0
endif
......@@ -116,6 +120,10 @@ ifneq ($(COMPILE_ANDOR3),0)
sub-dirs += andor3
endif
ifndef COMPILE_XH
COMPILE_XH = 0
endif
ifneq ($(COMPILE_XH),0)
sub-dirs += xh
endif
......@@ -136,6 +144,14 @@ ifneq ($(COMPILE_ULTRA),0)
sub-dirs += ultra
endif
ifndef COMPILE_MERLIN
COMPILE_MERLIN = 0
endif
ifneq ($(COMPILE_MERLIN),0)
sub-dirs += merlin
endif
ifndef COMPILE_XPAD
COMPILE_XPAD = 0
endif
......
......@@ -31,6 +31,7 @@ COMPILE_BASLER=0
COMPILE_PROSILICA=0
COMPILE_ROPERSCIENTIFIC=0
COMPILE_MYTHEN=0
COMPILE_MYTHEN3=0
COMPILE_ADSC=0
COMPILE_UEYE=0
COMPILE_XH=0
......@@ -49,6 +50,7 @@ COMPILE_DEXELA=0
COMPILE_RAYONIXHS=0
COMPILE_AVIEX=0
COMPILE_META=0
COMPILE_MERLIN=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -63,7 +65,7 @@ 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_ULTRA COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_ANDOR3 COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_META COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_HDF5_SAVING COMPILE_CONFIG\
COMPILE_GLDISPLAY \
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_META COMPILE_MERLIN \
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING \
COMPILE_HDF5_SAVING COMPILE_CONFIG COMPILE_GLDISPLAY \
LINK_STRICT_VERSION
......@@ -133,6 +133,12 @@ MYTHEN_FULL_VERSION = $(shell cat camera/mythen/VERSION)
INSTALL_MYTHEN_VDIR = $(INSTALL_MYTHEN_DIR)/v$(MYTHEN_FULL_VERSION)
endif
ifneq ($(COMPILE_MYTHEN3), 0)
INSTALL_MYTHEN3_DIR = $(INSTALL_PLAT_DIR)/Mythen3
MYTHEN3_FULL_VERSION = $(shell cat camera/mythen3/VERSION)
INSTALL_MYTHEN3_VDIR = $(INSTALL_MYTHEN3_DIR)/v$(MYTHEN3_FULL_VERSION)
endif
ifneq ($(COMPILE_UEYE), 0)
INSTALL_UEYE_DIR = $(INSTALL_PLAT_DIR)/Ueye
UEYE_FULL_VERSION = $(shell cat camera/ueye/VERSION)
......@@ -205,12 +211,19 @@ AVIEX_FULL_VERSION = $(shell cat camera/aviex/VERSION)
INSTALL_AVIEX_VDIR = $(INSTALL_AVIEX_DIR)/v$(AVIEX_FULL_VERSION)
endif
ifneq ($(COMPILE_META), 0)
INSTALL_META_DIR = $(INSTALL_PLAT_DIR)/Meta
META_FULL_VERSION = $(shell cat camera/common/meta/VERSION)
INSTALL_META_VDIR = $(INSTALL_META_DIR)/v$(META_FULL_VERSION)
endif
ifneq ($(COMPILE_MERLIN), 0)
INSTALL_MERLIN_DIR = $(INSTALL_PLAT_DIR)/Merlin
MERLIN_FULL_VERSION = $(shell cat camera/merlin/VERSION)
INSTALL_MERLIN_VDIR = $(INSTALL_MERLIN_DIR)/v$(MERLIN_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -419,6 +432,16 @@ ifneq ($(COMPILE_MYTHEN), 0)
cp camera/mythen/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_MYTHEN3), 0)
mkdir -p $(INSTALL_MYTHEN3_VDIR)
cp camera/mythen3/python/__init__.py $(INSTALL_MYTHEN3_DIR)
$(call install_core_dep,$(INSTALL_MYTHEN3_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimamythen3.so*
cp -d build/liblimamythen3.so* $(INSTALL_LIB_DIR)
cp sip/mythen3/limamythen3.so $(INSTALL_MYTHEN3_VDIR)
cp camera/mythen3/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_UEYE), 0)
mkdir -p $(INSTALL_UEYE_VDIR)
cp camera/ueye/python/__init__.py $(INSTALL_UEYE_DIR)
......@@ -546,6 +569,16 @@ ifneq ($(COMPILE_AVIEX), 0)
cp camera/aviex/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_MERLIN), 0)
mkdir -p $(INSTALL_MERLIN_VDIR)
cp camera/merlin/python/__init__.py $(INSTALL_MERLIN_DIR)
$(call install_core_dep,$(INSTALL_MERLIN_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimamerlin.so*
cp -d build/liblimamerlin.so* $(INSTALL_LIB_DIR)
cp sip/merlin/limamerlin.so $(INSTALL_MERLIN_VDIR)
cp camera/merlin/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_GLDISPLAY), 0)
mkdir -p $(INSTALL_GLDISPLAY_VDIR)
cp third-party/gldisplay/python/__init__.py $(INSTALL_GLDISPLAY_DIR)
......
......@@ -16,6 +16,7 @@ prosilica
roperscientific
adsc
mythen
mythen3
ueye
pco
perkinelmer
......@@ -31,6 +32,7 @@ dexela
rayonixhs
aviex
meta
merlin
*.obj
lima*.exp
lima*.lib
......
......@@ -68,6 +68,9 @@ ifneq ($(COMPILE_MYTHEN), 0)
sip-modules += mythen
endif
ifneq ($(COMPILE_MYTHEN3), 0)
sip-modules += mythen3
endif
ifneq ($(COMPILE_UEYE), 0)
sip-modules += ueye
......@@ -125,6 +128,10 @@ ifneq ($(COMPILE_META), 0)
sip-modules += meta
endif
ifneq ($(COMPILE_MERLIN), 0)
sip-modules += merlin
endif
all: src
src:
......
......@@ -42,8 +42,10 @@ modules = [('core', ['common', 'hardware', 'control']),
('prosilica', [os.path.join('camera','prosilica')]),
('ueye', [os.path.join('camera','ueye')]),
('roperscientific', [os.path.join('camera','roperscientific')]),
('adsc', [os.path.join('camera','adsc')]),
('adsc', [os.path.join('camera','adsc')]),
('merlin', [os.path.join('camera','merlin')]),
('mythen', [os.path.join('camera','mythen')]),
('mythen3', [os.path.join('camera','mythen3')]),
('perkinelmer', [os.path.join('camera','perkinelmer')]),
('andor', [os.path.join('camera','andor')]),
('andor3', [os.path.join('camera','andor3')]),
......@@ -180,7 +182,8 @@ def main():
elif(modName == 'xpad'):
extraIncludes += ['../../third-party/yat/include','/home/xpix_user/PCI_VALIDATED/trunk/sw/xpci_lib']
elif(modName == 'xspress3'):
extraIncludes += ['../../third-party/hdf5/include']
extraIncludes += ['../../third-party/hdf5/c++/src']
extra_cxxflags += ['-DSIPCOMPILATION']
elif(modName == 'pco'):
extraIncludes += ['R:/bliss/projects/LIMA/package/WIN32/PCO/sdkPco/include']
elif(modName == 'marccd'):
......
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