RHEL9 compliant

This commit is contained in:
Jan Chrin
2026-09-15 09:04:43 +02:00
parent 7f84e06fc2
commit 01f60b2f7f
29 changed files with 721214 additions and 530 deletions
Binary file not shown.
+9 -1
View File
@@ -101,6 +101,8 @@ int main( int argc, char *argv[] )
try
{
cout << "Open channels" << endl;
cafe->open(pvArray[0].c_str(), handle);
cafe->open(PV_WF, handle_wf);
cafe->open(pvArray[3].c_str(), h);
@@ -108,9 +110,15 @@ int main( int argc, char *argv[] )
}
catch(CAFEException_open & e)
{
cout << e.what() << endl;
cout << e.what() << endl;
exit(1);
}
catch(...)
{
cout << "Exception" << endl;
exit(1);
}
cout << "---------------------------------------------------------------------" << endl;
cout << "START: (1) Establishing connections to EPICS Process Variables (PVs) " << endl;
+13 -10
View File
@@ -9,10 +9,12 @@
#CAFE version to link to
#CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0
CAFE_VERSION=cafe-1.22.0-hipa-gcc-11.5.0
#CAFE_VERSION=cafe-1.15.0-gcc-10.3.0
#CAFE_VERSION=cafe-1.22.0-py39-gcc-11.5.0
PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m
PYTHON_LIB=/opt/gfa/python-3.7/latest/lib
#PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m
#PYTHON_LIB=/opt/gfa/python-3.7/latest/lib
PYTHON_INCLUDE=/psi.ch/group/8121/jan/pixi/pycafe-py39/.pixi/envs/work/include/python3.9
PYTHON_LIB=/psi.ch/group/8121/jan/pixi/pycafe-py39/.pixi/envs/work
EPICS_BASE=${EPICS}/base-7.0.10
@@ -21,22 +23,23 @@ CAFE_BASE=/psi.ch/project/cafe
CAFE_CPP_BASE=${CAFE_BASE}/bin/cpp
BOOST_BASE=${CAFE_BASE}/boost/boost_1_61_0/include
#BOOST_BASE=${CAFE_BASE}/boost/boost_1_61_0/include
BOOST_BASE=${CAFE_BASE}/boost/boost_1_91_0/boost
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${PYTHON_INCLUDE}
#-I$(BOOST_BASE)/boost
-I$(EPICS_BASE)/include/os/Linux \
-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/psi/Programming/gcc/10.3.0/lib64 -Wl,-rpath,/opt/psi/Programming/gcc/10.3.0/lib64 \
#-L$(PYTHON_LIB) -Wl,-rpath,$(PYTHON_LIB)
# -L$(PYTHON_LIB) -Wl,-rpath,$(PYTHON_LIB)
#-L/opt/psi/Programming/gcc/10.3.0/lib64 -Wl,-rpath,/opt/psi/Programming/gcc/10.3.0/lib64 \
LIBS += -lcafe -lca -lCom
#-lQt5Core -lpython3.7m