Skip to content

Commit

Permalink
Expect uhal library to be installed on the system.
Browse files Browse the repository at this point in the history
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] lnls-dig/uhal#55
  • Loading branch information
ericonr committed Oct 3, 2024
1 parent 963bff2 commit 7e90d34
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions utcaApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7e90d34

Please sign in to comment.