Skip to content

Commit 477634c

Browse files
committed
Add CONFIG_CAPUTLOG for user app configuration
- fixes #44
1 parent 16ce3a6 commit 477634c

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

caPutLogApp/CONFIG_CAPUTLOG

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# caPutLog Configuration for user applications
2+
#=============================================
3+
4+
# include guard
5+
ifeq (,$(_CONFIG_CAPUTLOG_INCLUDED))
6+
_CONFIG_CAPUTLOG_INCLUDED := YES
7+
8+
ifdef T_A
9+
10+
# On EPICS 7, enable the JSON & Array support
11+
12+
ifdef BASE_7_0
13+
USR_CPPFLAGS += -DJSON_AND_ARRAYS_SUPPORTED
14+
endif
15+
16+
endif # T_A
17+
18+
endif # _CONFIG_CAPUTLOG_INCLUDED

caPutLogApp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ INC += caPutJsonLogTask.h
3737
DBD += caPutJsonLog.dbd
3838
endif
3939

40+
# Install config file for applications
41+
CFG += CONFIG_CAPUTLOG
4042

4143
caPutLog_LIBS += $(EPICS_BASE_IOC_LIBS)
4244
caPutLog_SYS_LIBS_WIN32 += ws2_32

0 commit comments

Comments
 (0)