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

some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-10 11:20:50 +02:00
parent cf0ef68cda
commit ef9fd77850
6 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorGui/slsDetectorGui.pro
View File

@ -22,7 +22,7 @@ QMAKE_LIBS = -L$(QTDIR)/lib
#default
DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib $(LDFLAGDET)
CXXFLAGS += -g
@ -59,6 +59,7 @@ extralib.commands = echo `tput setaf 6`; \
echo 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'; \
echo `./updateGitVersion.sh; tput sgr0`
extralib.depends = $(target)
QMAKE_EXTRA_TARGETS += extralib
PRE_TARGETDEPS = extra
@ -71,8 +72,7 @@ DEPENDPATH += \
forms/include
INCLUDEPATH = \
. \
INCLUDEPATH += \
$(QWTDIR)/include\
$(QWTDIR) \
$(QWTDIR)/src\
@ -86,7 +86,8 @@ INCLUDEPATH = \
/usr/include/Qt\
/usr/include/QtCore\
/usr/include/QtGui\
$(INCLUDES)
$(INCLUDES)
#epics
# $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
@ -143,7 +144,7 @@ HEADERS = \
include/qTabDebugging.h\
include/qTabDeveloper.h\
include/qTabMessages.h\
gitInfoGui.h\
include/gitInfoGui.h\
../slsDetectorSoftware/commonFiles/sls_detector_defs.h\
../slsReceiverSoftware/include/sls_receiver_defs.h\
include/qServer.h