update Makefile, install.inc, configure.py for pco

parent e4da39f8
......@@ -213,6 +213,37 @@ build_targets += $(maxipix-libfull)
endif
############################
# LIMA - PCO
############################
ifneq ($(COMPILE_PCO),0)
PCO_LDFLAGS := -L$(SISODIR5)/lib64 -L. -g
PCO_LDLIBS := -lfglib5 -lclsersis -lhaprt -lpthread
pco-name := pco
pco-objs := ../camera/pco/src/Pco.o
pco-ver := ../camera/pco/VERSION
pco-flags := $(PCO_LDFLAGS)
pco-deps := $(DEPLIBS)
pco-libs := $(PCO_LDLIBS)
pco-libfull := $(call lib-full,$(pco-name),$(pco-ver))
# OLD 1=name, 2=ver-file 3=flags 4=deps, 5=target, 6=objs
# 1=name, 2=ver-file 3=deps 4=flags 5=libs, 6=target, 7=objs
$(pco-libfull): $(pco-objs)
$(call compile-lib,$(pco-name),$(pco-ver),\
$(pco-deps),$(pco-flags),$(pco-libs),$@,$(pco-objs))
$(call create-links,$(pco-name),$(pco-ver))
build_targets += $(pco-libfull)
endif
############################
# LIMA - BASLER
############################
......
......@@ -50,6 +50,14 @@ ifneq ($(COMPILE_MAXIPIX),0)
sub-dirs += maxipix
endif
ifndef COMPILE_PCO
COMPILE_PCO = 0
endif
ifneq ($(COMPILE_PCO),0)
sub-dirs += pco
endif
ifndef COMPILE_BASLER
COMPILE_BASLER = 0
endif
......
......@@ -96,6 +96,12 @@ MAXIPIX_FULL_VERSION = $(shell cat camera/maxipix/VERSION)
INSTALL_MAXIPIX_VDIR = $(INSTALL_MAXIPIX_DIR)/v$(MAXIPIX_FULL_VERSION)
endif
ifneq ($(COMPILE_PCO), 0)
INSTALL_PCO_DIR = $(INSTALL_PLAT_DIR)/Pco
PCO_FULL_VERSION = $(shell cat camera/pco/VERSION)
INSTALL_PCO_VDIR = $(INSTALL_PCO_DIR)/v$(PCO_FULL_VERSION)
endif
ifneq ($(COMPILE_PILATUS), 0)
INSTALL_PILATUS_DIR = $(INSTALL_PLAT_DIR)/Pilatus
PILATUS_FULL_VERSION = $(shell cat camera/pilatus/VERSION)
......@@ -358,6 +364,16 @@ ifneq ($(COMPILE_SIMULATOR), 0)
cp sip/simulator/limasimulator.so $(INSTALL_SIMU_VDIR)
cp camera/simulator/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_PCO), 0)
mkdir -p $(INSTALL_PCO_VDIR)
cp camera/pco/python/__init__.py $(INSTALL_PCO_DIR)
$(call install_core_dep,$(INSTALL_PCO_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimapco.so*
cp -d build/liblimapco.so* $(INSTALL_LIB_DIR)
cp sip/pco/limapco.so $(INSTALL_PCO_VDIR)
cp camera/pco/python/Pco.py $(INSTALL_PCO_VDIR)
cp camera/pco/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_ESPIA), 0)
mkdir -p $(INSTALL_ESPIA_VDIR)
cp camera/common/espia/python/__init__.py $(INSTALL_ESPIA_DIR)
......
......@@ -41,6 +41,10 @@ ifneq ($(COMPILE_MAXIPIX), 0)
sip-modules += maxipix
endif
ifneq ($(COMPILE_PCO), 0)
sip-modules += pco
endif
ifneq ($(COMPILE_BASLER), 0)
ifndef PYLON_ROOT
export PYLON_ROOT = /opt/pylon
......
......@@ -114,6 +114,9 @@ def main():
for modName, modDirs in modules:
extra_cxxflags = []
extra_libs = []
extra_lib_dirs = []
if modName in excludeMods:
continue
......@@ -188,8 +191,9 @@ def main():
elif(modName == 'xspress3'):
extraIncludes += ['../../third-party/hdf5/c++/src']
extra_cxxflags += ['-DSIPCOMPILATION']
elif(modName == 'pco'):
extraIncludes += ['R:/bliss/projects/LIMA/package/WIN32/PCO/sdkPco/include']
elif(modName == 'pco') and platform.system() != 'Windows':
extra_lib_dirs = ["%s/lib" % os.environ['SISODIR5']]
extra_libs += ['fglib5' , 'clsersis' , 'haprt']
elif(modName == 'marccd'):
extraIncludes += ['../../../include/DiffractionImage']
extraIncludes += ['../../third-party/yat/include']
......
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