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

changed the makefile a bit to find libraries

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-06-30 12:20:42 +02:00
parent c01931e5a6
commit bd9f19f6c7
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorGui/Makefile
View File

@ -10,6 +10,7 @@ $(info )
DESTDIR ?= ../bin DESTDIR ?= ../bin
LIBDIR ?= ../bin
PROG = $(DESTDIR)/slsDetectorGui PROG = $(DESTDIR)/slsDetectorGui
DOCDIR ?= docs DOCDIR ?= docs
@ -46,7 +47,7 @@ clean:
Makefile.gui: mm Makefile.gui: mm
mm: mm:
qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' LIBDIR='$(LIBDIR)'
doc: doc:
cd manual && $(MAKE) DESTDIR=$(DOCDIR) cd manual && $(MAKE) DESTDIR=$(DOCDIR)
@ -55,7 +56,7 @@ htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile slsDetectorGui.pro $(DIR) $(PROG): Makefile slsDetectorGui.pro $(DIR)
$(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
guiclient: guiclient:
# echo $(WD) # echo $(WD)

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: 9794596be92a600d19395eb6bf7818ae5e0a68f7 Repsitory UUID: 0da39fb3680d6eb9d8a9871cb9e6a152ee638046
Revision: 398 Revision: 399
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 398 Last Changed Rev: 399
Last Changed Date: 2017-06-29 10:18:51 +0200 Last Changed Date: 2017-06-29 17:09:46 +0200

6
slsDetectorGui/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "9794596be92a600d19395eb6bf7818ae5e0a68f7" #define SVNREPUUID "0da39fb3680d6eb9d8a9871cb9e6a152ee638046"
//#define SVNREV 0x398 //#define SVNREV 0x399
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x398 #define SVNREV 0x399
#define SVNDATE 0x20170629 #define SVNDATE 0x20170629
// //