Fix _LIB setting logic in downstream RULES_OPCUA

- distinguish PROVIDED and SYSTEM cases - ..._SYS_LIBS_Linux is not used with open62541 (as Gnu @ Windows needs the same setting)
epics-modules · Sep 17, 2024 · b5db094 · b5db094
1 parent 03c9e07
commit b5db094
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/devOpcuaSup/UaSdk/RULES_OPCUA b/devOpcuaSup/UaSdk/RULES_OPCUA
@@ -14,9 +14,12 @@ _OPCUA_CHECK_VARS := PROD TESTPROD $(PROD) $(TESTPROD) $(LIBRARY)
 
 # $(1) is PROD or LIBRARY name
 define _UASDK_ADD_SDKLIBS
-ifneq ($(UASDK_DEPLOY_MODE),EMBED)
+ifeq ($(UASDK_DEPLOY_MODE),PROVIDED)
 $(1)_LIBS := $$($(1)_LIBS) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(UASDK_LIBS))
 endif
+ifeq ($(UASDK_DEPLOY_MODE),SYSTEM)
+$(1)_SYS_LIBS := $$($(1)_SYS_LIBS) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(UASDK_LIBS))
+endif
 $(1)_SYS_LIBS_Linux := $$($(1)_SYS_LIBS_Linux) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(OPCUA_SYS_LIBS_Linux))
 endef
 

diff --git a/devOpcuaSup/open62541/RULES_OPCUA b/devOpcuaSup/open62541/RULES_OPCUA
@@ -14,10 +14,12 @@ _OPCUA_CHECK_VARS := PROD TESTPROD $(PROD) $(TESTPROD) $(LIBRARY)
 
 # $(1) is PROD or LIBRARY name
 define _OPEN62541_ADD_SDKLIBS
-ifneq ($(OPEN62541_DEPLOY_MODE),EMBED)
+ifeq ($(OPEN62541_DEPLOY_MODE),PROVIDED)
 $(1)_LIBS := $$($(1)_LIBS) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(OPEN62541_LIBS))
 endif
-$(1)_SYS_LIBS_Linux := $$($(1)_SYS_LIBS_Linux) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(OPEN62541_SYS_LIBS_Linux))
+ifeq ($(OPEN62541_DEPLOY_MODE),SYSTEM)
+$(1)_SYS_LIBS := $$($(1)_SYS_LIBS) $$(if $$(filter opcua,$$($(1)_LIBS)),$$(OPEN62541_LIBS))
+endif
 endef
 
 $(foreach loc,$(_OPCUA_CHECK_VARS),$(eval $(call _OPEN62541_ADD_SDKLIBS,$(loc))))