1.15.0 update

examples/cafeTest/makefile7

@@ -5,12 +5,14 @@
 # Makefile to build a simple C++ cafe client 
 #
 
-
+#-py37- libcafe.so: undefined reference to `cy_event_handler_wrapper
 #CAFE version to link to
-CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0
+#CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0
+#CAFE_VERSION=cafe-1.15.0-py37-gcc-10.3.0
+CAFE_VERSION=cafe-1.15.0-gcc-10.3.0
 
-#PYTHON_INCLUDE=/opt/gfa/python-3.5/latest/include/python3.5m
-#PYTHON_LIB=/opt/gfa/python-3.5/latest/lib
+PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m
+PYTHON_LIB=/opt/gfa/python-3.7/latest/lib
 
 EPICS_BASE=${EPICS}/base-7.0.6
 
@@ -19,23 +21,23 @@ CAFE_BASE=/opt/gfa/cafe
 CAFE_CPP_BASE=${CAFE_BASE}/cpp
 
 
-
 BOOST_BASE=${CAFE_BASE}/boost/boost_1_61_0/include
 
 INCLUDE_PATH += -I$(CAFE_CPP_BASE)/$(CAFE_VERSION)/include \
  -I$(EPICS_BASE)/include  -I$(EPICS_BASE)/include/compiler/gcc \
   -I$(EPICS_BASE)/include/os/Linux \
- -I$(BOOST_BASE) 
+ -I$(BOOST_BASE) -I${PYTHON_INCLUDE}
  #-I$(BOOST_BASE)/boost
 
 LIB_DIR += -L$(EPICS_BASE)/lib/${EPICS_HOST_ARCH} \
  -Wl,-rpath,$(EPICS_BASE)/lib/${EPICS_HOST_ARCH} \
  -L$(CAFE_CPP_BASE)/$(CAFE_VERSION)/lib/${EPICS_HOST_ARCH} \
  -Wl,-rpath,$(CAFE_CPP_BASE)/$(CAFE_VERSION)/lib/${EPICS_HOST_ARCH} \
- -L/opt/gfa/python-3.7/latest/lib \
- -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+ -L/opt/psi/Programming/gcc/10.3.0/lib64 -Wl,-rpath,/opt/psi/Programming/gcc/10.3.0/lib64 \
+ -L$(PYTHON_LIB) -Wl,-rpath,$(PYTHON_LIB) 
 
-LIBS += -lcafe -lca -lCom -lQt5Core
+
+LIBS += -lcafe -lca -lCom -lQt5Core -lpython3.7m
 
 cafeTest: cafeTest.cc callbacks.h
 	g++ cafeTest.cc -o cafeTest \