From 9397449887b33a4e023b9e63c5ca022565c965ad Mon Sep 17 00:00:00 2001 From: Alexander Schwinn <al.schwinn@gsi.de> Date: Tue, 17 May 2022 12:29:05 +0200 Subject: [PATCH] Usage of global snap7 library - Usage of "rpath" in silecs-cli-client so prevent the need to set LD_LIBRARY_PATH --- silecs-cli-client/Makefile.dep | 7 +++++-- silecs-diagnostic-cpp/Makefile.dep | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/silecs-cli-client/Makefile.dep b/silecs-cli-client/Makefile.dep index 2089ed9..c35a053 100644 --- a/silecs-cli-client/Makefile.dep +++ b/silecs-cli-client/Makefile.dep @@ -9,14 +9,17 @@ SILECS_COMM_HOME ?= ../silecs-communication-cpp/build LIBXML_PATH ?= /usr/include/libxml2/ #for compile out of eclipse -SNAP7_BASE ?= ../snap7/snap7-full +#SNAP7_BASE ?= ../snap7/snap7-full +SNAP7_BASE ?= /common/usr/cscofe/silecs/snap7 DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(LIBXML_PATH) DEPENDENT_COMPILER_OPTIONS += -I$(BOOST_HOME)/include DEPENDENT_LINKER_OPTIONS += -L$(SILECS_COMM_HOME)/lib/$(CPU) -DEPENDENT_LINKER_OPTIONS += -L$(SNAP7_BASE)/build/bin/$(CPU)-linux -lsnap7 +DEPENDENT_LINKER_OPTIONS += -L$(SNAP7_BASE)/bin/$(CPU)-linux -lsnap7 DEPENDENT_LINKER_OPTIONS += -L/usr/lib64 -lxml2 DEPENDENT_LINKER_OPTIONS += -lsilecs-comm DEPENDENT_LINKER_OPTIONS += -lstdc++ -lxml2 -lboost_system -lboost_filesystem -lcurl + +DEPENDENT_LINKER_OPTIONS += -Wl,-rpath=$(SNAP7_BASE)/bin/$(CPU)-linux diff --git a/silecs-diagnostic-cpp/Makefile.dep b/silecs-diagnostic-cpp/Makefile.dep index bbc71cc..afd5720 100644 --- a/silecs-diagnostic-cpp/Makefile.dep +++ b/silecs-diagnostic-cpp/Makefile.dep @@ -14,7 +14,7 @@ LIBXML_PATH ?= /usr/include/libxml2/ #for compile out of eclipse #SNAP7_BASE ?= ../../git/snap7/snap7-full -SNAP7_BASE ?= ../snap7/snap7-full +SNAP7_BASE ?= /common/usr/cscofe/silecs/snap7 DEPENDENT_COMPILER_OPTIONS += -I$(RBACK_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include @@ -26,11 +26,11 @@ DEPENDENT_COMPILER_OPTIONS += -I/usr/include/QtGui DEPENDENT_LINKER_OPTIONS += -L$(RBACK_HOME)/lib DEPENDENT_LINKER_OPTIONS += -L$(SILECS_COMM_HOME)/lib/$(CPU) -DEPENDENT_LINKER_OPTIONS += -L$(SNAP7_BASE)/build/bin/$(CPU)-linux -lsnap7 +DEPENDENT_LINKER_OPTIONS += -L$(SNAP7_BASE)/bin/$(CPU)-linux -lsnap7 DEPENDENT_LINKER_OPTIONS += -L$(BOOST_HOME)/lib/$(CPU) DEPENDENT_LINKER_OPTIONS += -L/usr/lib64 -lxml2 DEPENDENT_LINKER_OPTIONS += -lsilecs-comm DEPENDENT_LINKER_OPTIONS += -lstdc++ -lxml2 -lboost_system -lboost_filesystem -lcurl -lQtGui -lQtCore -DEPENDENT_LINKER_OPTIONS += -Wl,-rpath=$(SNAP7_BASE)/build/bin/$(CPU)-linux +DEPENDENT_LINKER_OPTIONS += -Wl,-rpath=$(SNAP7_BASE)/bin/$(CPU)-linux -- GitLab