Skip to content

add qsrv (PVA) to template build.mak #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FreddieAkeroyd merged 5 commits into from
Apr 24, 2024
Merged

add qsrv (PVA) to template build.mak #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b46971
add qsrv (PVA) to template build.mak
rerpha Apr 16, 2024
548c324
use qsrv then pvxs
rerpha Apr 17, 2024
3104804
use central pva.mak
rerpha Apr 22, 2024
832a47d
Fix include path and restrict to QSRV1 for moment
FreddieAkeroyd Apr 24, 2024
b03634c
remove space
FreddieAkeroyd Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions configure/CONFIG_PVA_ISIS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# QSRV/PVXS for PVA
#ifdef PVXS_MAJOR_VERSION # prefer QSRV2 :)
#$(APPNAME)_DBD += pvxsIoc.dbd
#$(APPNAME)_LIBS += pvxsIoc pvxs
#else
ifdef EPICS_QSRV_MAJOR_VERSION # fallback to QSRV1
$(APPNAME)_LIBS += qsrv
$(APPNAME)_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
$(APPNAME)_DBD += PVAServerRegister.dbd
$(APPNAME)_DBD += qsrv.dbd
endif
#endif
2 changes: 2 additions & 0 deletions modules/database/src/template/top/iocApp/src/build.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ $(APPNAME)_SRCS_vxWorks += -nil-
# Add support from base/src/vxWorks if needed
#$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary

include $(CONFIG)/CONFIG_PVA_ISIS

# Finally link to the EPICS Base libraries
$(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS)

Expand Down