Commit 89aa4b69 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline

Merge 'slsdetector' into 'master' branch

parents 71c6fef8 62ce344c
Subproject commit 8651e3fbc24dd472b7c395dcdbdf63024aeaf1bc
Subproject commit 043e98cdab4c87a0e61dc0c89b46008785d13bf8
Subproject commit de8c345f0880619950b5e2892ac2bd9b08e2fe2a
Subproject commit 39bf6a5bb500ad8a588899f689be0be90e017200
......@@ -918,6 +918,7 @@ endif
############################
ifneq ($(COMPILE_SLSDETECTOR),0)
SLS_DETECTORS_DIR := ../camera/slsdetector/slsDetectorPackage
SLSDETECTOR_LDFLAGS := -L$(SLS_DETECTORS_DIR)/bin
SLSDETECTOR_LDLIBS := -lSlsDetector -lSlsReceiver
......
Subproject commit 421488d9857764a5baa4a0c4be56a3d05f4367f6
Subproject commit de47e9b4c53d90009da86719b419a84a4801ff36
......@@ -212,7 +212,7 @@ def main():
extra_cxxflags += ['-std=c++11']
extra_cxxflags += ['-DSIPCOMPILATION']
elif (modName == 'slsdetector'):
SLS_DETECTORS_DIR = os.environ['SLS_DETECTORS_DIR']
SLS_DETECTORS_DIR = '../../camera/slsdetector/slsDetectorPackage'
SLS_DETECTORS_SW = os.path.join(SLS_DETECTORS_DIR,
'slsDetectorSoftware')
SLS_DETECTORS_RECV = os.path.join(SLS_DETECTORS_DIR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment