From 915fd41bf6fb72c7530ef8d5d9030e732abbd88c Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 26 Jul 2017 15:09:24 +0200 Subject: [PATCH] should be able to compile in pcmoench as l_msdetect --- slsDetectorGui/Makefile | 4 ++++ slsDetectorGui/gitInfo.txt | 8 ++++---- slsDetectorGui/include/gitInfoGui.h | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 07b1b8747..d91ea4f7d 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -18,6 +18,10 @@ LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYRXRDIR ?= ../slsReceiverSoftware INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes +LDFLAGDET ?= -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector + + + #ifeq ( $(EIGERSLS), yes) # LDFLAG += $(EIGERFLAGS) #else ifeq ( $(ROOTSLS), yes) diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 61eea0e76..78840234d 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui 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 -Repsitory UUID: a391613c47abcacccd7690300cc70c4b4cd5aad4 -Revision: 409 +Repsitory UUID: 0feb7f734e1ef261dcc82d13df4a5caaf90917f4 +Revision: 411 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 409 -Last Changed Date: 2017-07-25 17:50:52.000000002 +0200 ./Makefile +Last Changed Rev: 411 +Last Changed Date: 2017-07-26 15:07:21.000000002 +0200 ./Makefile diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index c367eb73b..132aeff8f 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "a391613c47abcacccd7690300cc70c4b4cd5aad4" -//#define SVNREV 0x409 +#define SVNREPUUID "0feb7f734e1ef261dcc82d13df4a5caaf90917f4" +//#define SVNREV 0x411 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x409 -#define SVNDATE 0x20170725 +#define SVNREV 0x411 +#define SVNDATE 0x20170726 //