detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity

ordered the makefile a bit, needs more revising

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@189 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-05-23 12:26:08 +00:00
parent 014dfd7eed
commit 6aeacf7b13
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/Makefile
View File

@ -8,6 +8,7 @@ LIBRARYDIR?=../slsDetectorSoftware
INCLUDES?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions
LDFLAG?=-L$(LIBRARYDIR)/bin -lSlsDetector
all: $(PROG) Makefile.gui guiclient
clean:
@ -19,7 +20,7 @@ clean:
Makefile.gui: mm
mm:
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)'
doc:
cd manual && make DESTDIR=$(DOCDIR)

59
slsDetectorGui/slsDetectorGui.pro
View File

@ -1,28 +1,44 @@
#When using yum for qt, comment out all lines with $(QTDIR) or $(QWTDIR), but export QWTDIR = /usr/include/qwt/
#and leave "$(QWTDIR) \"uncommented in the INCLUDEPATH
QT_INSTALL_PREFIX=$(QTDIR)
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_MOC = $(QTDIR)/bin/moc
QMAKE_RCC = $(QTDIR)/bin/rcc
QMAKE_INCDIR_QT = $(QTDIR)/include/
#When using epics, uncomment epics defines, libs and a line in INCLUDEPATH
QT_INSTALL_PREFIX = $(QTDIR)
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_MOC = $(QTDIR)/bin/moc
QMAKE_RCC = $(QTDIR)/bin/rcc
QMAKE_INCDIR_QT = $(QTDIR)/include/
QMAKE_LIBS_QT = -L$(QTDIR)/lib
QMAKE_LIBS = -L$(QTDIR)/lib
#epics
#DEFINES += EPICS VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
#LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
#default
DEFINES += VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w
QMAKE_LIBS_QT = -L$(QTDIR)/lib
QMAKE_LIBS = -L$(QTDIR)/lib
DESTDIR ?= bin
MOC_DIR = mocs
OBJECTS_DIR = objs
UI_HEADERS_DIR = forms/include
SLSDETLIB ?=../slsDetectorSoftware
SLSDETLIB ?= ../slsDetectorSoftware
RESOURCES += icons.qrc
CONFIG += debug no_include_pwd
QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w
DEFINES += VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
#DEFINES += EPICS VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
target.path += $(DESTDIR)
documentation.path = /$(DOCPATH)
@ -33,19 +49,13 @@ QMAKE_CLEAN += docs/*/*
#LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\
# -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
#LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
DEPENDPATH += \
slsDetectorPlotting/include\
include\
forms/include
INCLUDEPATH = \
$(QWTDIR)/include\
$(QWTDIR) \
@ -55,9 +65,14 @@ INCLUDEPATH = \
include\
forms/include\
$(INCLUDES)
#epics
# $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
SOURCES = \
slsDetectorPlotting/src/SlsQt1DPlot.cxx\
slsDetectorPlotting/src/SlsQt1DZoomer.cxx\