Commit 86aa95ff authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Operator for ID00

SlsDetector: add ESRF/Bliss GitHub slsDetectorPackage as submodule

parent 5f0f4857
......@@ -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 4b3be9cbef8b07d23f398d1d7167b1a97c3e5533
Subproject commit 208df25a0c5a232d1af88b2e857ba72bf71dbce4
......@@ -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