From 04f58e6e4f6c26f13058357c34559e5946e207e4 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn <al.schwinn@gsi.de> Date: Tue, 3 May 2022 14:04:03 +0200 Subject: [PATCH] bump make-generic version for acc8 cluster --- silecs-cli-client/Makefile | 2 +- silecs-cli-client/Makefile.dep | 6 ++---- silecs-communication-cpp/Makefile | 2 +- silecs-diagnostic-cpp/Makefile | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/silecs-cli-client/Makefile b/silecs-cli-client/Makefile index 5edb7ed..9a2fe65 100644 --- a/silecs-cli-client/Makefile +++ b/silecs-cli-client/Makefile @@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE #local #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles #global -COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0 +COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2 #Enable C++11 Support COMPILER_FLAGS += -std=c++11 diff --git a/silecs-cli-client/Makefile.dep b/silecs-cli-client/Makefile.dep index 08237c8..2089ed9 100644 --- a/silecs-cli-client/Makefile.dep +++ b/silecs-cli-client/Makefile.dep @@ -4,14 +4,12 @@ SILECS_COMM_VERSION = 1.0.2 BOOST_HOME ?= /acc/local/$(CPU)/3rdparty/boost/$(BOOST_VERSION) #for compile out of eclipse -SILECS_COMM_HOME ?= ../../git/silecs-communication-cpp/build -#SILECS_COMM_HOME ?= ../silecs-communication-cpp/build +SILECS_COMM_HOME ?= ../silecs-communication-cpp/build LIBXML_PATH ?= /usr/include/libxml2/ #for compile out of eclipse -SNAP7_BASE ?= ../../git/snap7/snap7-full -#SNAP7_BASE ?= ../snap7/snap7-full +SNAP7_BASE ?= ../snap7/snap7-full DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(LIBXML_PATH) diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile index 421366c..1a542d4 100644 --- a/silecs-communication-cpp/Makefile +++ b/silecs-communication-cpp/Makefile @@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE #local #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles #global -COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0 +COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2 # product configuration LIB_NAME = comm diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile index 8af309c..fc5a176 100644 --- a/silecs-diagnostic-cpp/Makefile +++ b/silecs-diagnostic-cpp/Makefile @@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE #local #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles #global -COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0 +COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2 # product configuration BIN_NAME = $(PROJECT)-$(PRODUCT) -- GitLab