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

moved common files outside slsDetectorSoftware

Browse Source
This commit is contained in:
maliakal_d
2018-10-02 16:07:53 +02:00
parent 97934e323c
commit 757bc89d05
19 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/CMakeLists.txt
View File

@ -75,7 +75,7 @@ qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
include_directories(
include
slsDetectorPlotting/include
../slsDetectorSoftware/commonFiles
../commonFiles
../slsDetectorSoftware/slsReceiverInterface
../slsDetectorSoftware/slsDetector
../slsDetectorSoftware/slsDetectorAnalysis

2
slsDetectorGui/Makefile
View File

@ -16,7 +16,7 @@ DOCDIR ?= docs
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
INCLUDES ?= ../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

4
slsDetectorGui/client/Makefile
View File

@ -5,9 +5,9 @@ LDLIBS += -lm -lstdc++ -pthread
LDIR = ../../slsDetectorSoftware
RDIR = ../../slsReceiverSoftware
DDIR = ../../bin
INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
INCLUDES = -I ../../commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp
DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h $(LDIR)/commonFiles/sls_detector_defs.h
DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../commonFiles/sls_detector_defs.h
all: client

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -145,7 +145,7 @@ HEADERS = \
include/qTabDeveloper.h\
include/qTabMessages.h\
include/gitInfoGui.h\
../slsDetectorSoftware/commonFiles/sls_detector_defs.h\
../commonFiles/sls_detector_defs.h\
../slsReceiverSoftware/include/sls_receiver_defs.h\
include/qServer.h