From 7e90d34987a050e6215d4cd95af9b7d2fcdca453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 1 Oct 2024 15:28:13 -0300 Subject: [PATCH] Expect uhal library to be installed on the system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This simplifies an eventual containerized build of afc-epics-ioc using epics-in-docker, allowing the μHAL build script to simply install it directly into system directories. We should eventually stop requiring an -I flag for cases where the headers are installed to default system locations. This is tracked by a uhal issue [1]. [1] https://github.com/lnls-dig/uhal/issues/55 --- README.md | 2 +- utcaApp/src/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1b04dc9..9c35fe2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ library](https://github.com/lnls-dig/uhal). This project uses the EPICS build system, and it depends on EPICS 7, and the Asyn and Autosave modules; and the μHAL library. The `configure/RELEASE.local` file must define the paths for `EPICS_BASE`, `ASYN`, `AUTOSAVE`, and `RETOOLS`; -and `UHAL` and `UHAL_LIBS`. +and the μHAL library is expected to be installed to `/usr/local`. ## Licensing diff --git a/utcaApp/src/Makefile b/utcaApp/src/Makefile index 70a9538..a30f3ee 100644 --- a/utcaApp/src/Makefile +++ b/utcaApp/src/Makefile @@ -34,11 +34,9 @@ utca_DBD += aSubRoutines.dbd utca_DBD += menuScan.dbd -utca_LIBS += uhal-modules uhal-utilities -uhal-utilities_DIR = $(UHAL_LIBS) -uhal-modules_DIR = $(UHAL_LIBS) +utca_SYS_LIBS += uhal-modules uhal-utilities -OP_SYS_INCLUDES += -I$(UHAL)/include/uhal +OP_SYS_INCLUDES += -I/usr/local/include/uhal USR_CXXFLAGS += -std=c++20 -Wall -Wextra # Build the IOC application