Commit b9a8d7bd authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

Added GLDisplay to core-1.3: A Qt4/OpenGL live display for Lima.

See third-party/gldisplay/README for brief introduction
parent ad0bdd32
......@@ -97,3 +97,6 @@
[submodule "camera/dexela"]
path = camera/dexela
url = git://github.com/esrf-bliss/Lima-camera-dexela.git
[submodule "third-party/gldisplay"]
path = third-party/gldisplay
url = git://github.com/esrf-bliss/gldisplay.git
......@@ -37,8 +37,9 @@ config.inc:
@false
config:
cd third-party/Processlib/sip; python configure.py
make -C third-party prelima.config
$(MAKE) -C sip config
make -C third-party postlima.config
include install.inc
......@@ -49,6 +49,7 @@ COMPILE_FITS_SAVING=0
COMPILE_EDFGZ_SAVING=0
COMPILE_TIFF_SAVING=0
COMPILE_CONFIG=1
COMPILE_GLDISPLAY=0
LINK_STRICT_VERSION=0
export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX COMPILE_PILATUS \
......@@ -57,4 +58,5 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_CONFIG\
COMPILE_GLDISPLAY \
LINK_STRICT_VERSION
......@@ -201,6 +201,13 @@ ifneq ($(COMPILE_CONFIG),0)
INSTALL_CONFIG_DEFINES += -DWITH_CONFIG
INSTALL_DEPS += libconfig.install
endif
ifneq ($(COMPILE_GLDISPLAY), 0)
INSTALL_GLDISPLAY_DIR = $(INSTALL_PLAT_DIR)/GLDisplay
GLDISPLAY_FULL_VERSION = $(shell cat third-party/gldisplay/VERSION)
INSTALL_GLDISPLAY_VDIR = $(INSTALL_GLDISPLAY_DIR)/v$(GLDISPLAY_FULL_VERSION)
endif
##################
# INSTALL DEPS #
##################
......@@ -438,3 +445,13 @@ ifneq ($(COMPILE_IMXPAD), 0)
cp sip/imxpad/limaimxpad.so $(INSTALL_IMXPAD_VDIR)
cp camera/imxpad/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)
$(call install_core_dep,$(INSTALL_GLDISPLAY_VDIR))
rm -rf $(INSTALL_LIB_DIR)/libgldisplay.so*
cp -d third-party/gldisplay/build/libgldisplay.so* $(INSTALL_LIB_DIR)
cp third-party/gldisplay/sip/gldisplay.so $(INSTALL_GLDISPLAY_VDIR)
cp third-party/gldisplay/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -104,10 +104,11 @@ endif
all: src
src:
$(MAKE) -C ../third-party sip
$(MAKE) -C ../third-party prelima.sip
for d in $(sip-modules); do \
$(MAKE) -C $$d || break; \
done
$(MAKE) -C ../third-party postlima.sip
config: clean mrproper
python configure.py
......
......@@ -22,7 +22,11 @@
include ../config.inc
PROJECTS = processlib.src
PROJECTS_TEST =
PROJECTS_PRELIMA_CONFIG = processlib.config
PROJECTS_PRELIMA_SIP = processlib.sip
PROJECTS_POSTLIMA_CONFIG =
PROJECTS_POSTLIMA_SIP =
PROJECTS_CLEAN = processlib.clean
ifndef COMPILE_CBF_SAVING
......@@ -87,27 +91,66 @@ PROJECTS += libconfig.src
endif
ifndef COMPILE_GLDISPLAY
COMPILE_GLDISPLAY = 0
endif
ifneq ($(COMPILE_GLDISPLAY),0)
ifndef COMPILE_SPS_IMAGE
COMPILE_SPS_IMAGE = 0
endif
ifeq ($(COMPILE_SPS_IMAGE),0)
$(error "GLDisplay requires SPS. Please set COMPILE_SPS_IMAGE=1 in config.inc)
endif
PROJECTS += gldisplay.src
PROJECTS_TEST += gldisplay.test
PROJECTS_POSTLIMA_CONFIG += gldisplay.config
PROJECTS_POSTLIMA_SIP += gldisplay.sip
PROJECTS_CLEAN += gldisplay.clean
endif
# meta targets
all: src test
src: $(PROJECTS)
sip: processlib.sip
test: $(PROJECTS_TEST)
@echo
prelima.config: $(PROJECTS_PRELIMA_CONFIG)
processlib.src: Processlib_build_libprocesslib.so
prelima.sip: $(PROJECTS_PRELIMA_SIP)
processlib.sip: Processlib/sip/Makefile Processlib/sip/processlib.so
postlima.config: $(PROJECTS_POSTLIMA_CONFIG)
@echo
postlima.sip: $(PROJECTS_POSTLIMA_SIP)
@echo
processlib.clean:
cd Processlib/sip/ && python clean.py
clean: $(PROJECTS_CLEAN)
# specific targets
processlib.src: Processlib_build_libprocesslib.so
processlib.config: processlib.clean.sip Processlib/sip/Makefile
processlib.clean.sip:
cd Processlib/sip && python clean.py
processlib.sip: Processlib/sip/processlib.so
processlib.clean: processlib.clean.sip
$(MAKE) -C Processlib/build clean
Processlib/sip/Makefile:
cd Processlib/sip/ && python configure.py
cd Processlib/sip && python configure.py
Processlib_build_libprocesslib.so:
$(MAKE) -C Processlib/build -j2
Processlib/sip/processlib.so: Processlib_build_libprocesslib.so
Processlib/sip/processlib.so: Processlib_build_libprocesslib.so \
Processlib/sip/Makefile
$(MAKE) -C Processlib/sip -j2
sps.src: Sps/Src/sps.o
......@@ -160,7 +203,28 @@ libconfig.confsrc:
libconfig.install:
cd libconfig && ./configure --prefix=$(INSTALL_PLAT_DIR) && $(MAKE) install
test:
@echo
gldisplay.src: gldisplay_build_libgldisplay.so
gldisplay.test:
$(MAKE) -C gldisplay test
gldisplay.config: gldisplay.clean.sip gldisplay/sip/Makefile
gldisplay.clean.sip:
cd gldisplay/sip && python clean.py
gldisplay.clean: gldisplay.clean.sip
$(MAKE) -C gldisplay clean
gldisplay.sip: gldisplay/sip/gldisplay.so
gldisplay_build_libgldisplay.so:
$(MAKE) -C gldisplay src
gldisplay/sip/Makefile:
cd gldisplay/sip && python configure.py
gldisplay/sip/gldisplay.so: gldisplay_build_libgldisplay.so \
gldisplay/sip/Makefile
$(MAKE) -C gldisplay sip
clean: $(PROJECTS_CLEAN)
Subproject commit e3d1b59986244b4b4bc9a9dc6886d9fda2573bde
Subproject commit 4c264f370664f0235ecaaf3e352a4be2753f4544
Subproject commit c7c70ab52122c3e6fca2efd3230274f9fcf3fd11
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