first user commit to gitea
This commit is contained in:
+16
-9
@@ -4,7 +4,7 @@
|
||||
#<target_language = cpp matlab python>
|
||||
module unload gcc
|
||||
#module load gcc/7.3.0 #7.5.0 for py38 py310 7.3.0 py37
|
||||
module load gcc/10.4.0 ##rhel8
|
||||
#module load gcc/10.4.0 ##rhel8
|
||||
### psi specific - end
|
||||
|
||||
rm -f configure.ac
|
||||
@@ -24,8 +24,8 @@ automake --force --add-missing --copy
|
||||
#Used by ./configure
|
||||
#Assumes format ${EPICS}/base-3.14.12
|
||||
#source cafeVersion-gcc-7.3.0
|
||||
CAFE_V="cafe-1.21.0"
|
||||
EPICS_BASE='base-7.0.8' #
|
||||
CAFE_V="cafe-1.22.0"
|
||||
EPICS_BASE='base-7.0.9' #
|
||||
|
||||
#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
|
||||
#Assume Linux but check if Darwin
|
||||
@@ -207,6 +207,9 @@ else
|
||||
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
|
||||
then
|
||||
CAFE_V+="-sf"
|
||||
elif [ "$FACILITY" = "hipa" ] && [ "$CACLIENT" != "matlab" ]
|
||||
then
|
||||
CAFE_V+="-hipa"
|
||||
elif [ "$FACILITY" = "sls" ] && [ "$CACLIENT" != "matlab" ]
|
||||
then
|
||||
CAFE_V+="-epics3"
|
||||
@@ -243,11 +246,15 @@ then
|
||||
elif [ "$CACLIENT" = "py310" ]
|
||||
then
|
||||
ENABLE_OPTIONS+=" --enable-python310"
|
||||
#ENABLE_OPTIONS+=" --enable-qt5py310"
|
||||
ENABLE_OPTIONS+=" --enable-qt5py310"
|
||||
CAFE_V+="-py310"
|
||||
|
||||
elif [ "$CACLIENT" = "cpp" ]
|
||||
then
|
||||
ENABLE_OPTIONS+=" --enable-qt5"
|
||||
if [ "$FACILITY" != "hipa" ]
|
||||
then
|
||||
ENABLE_OPTIONS+=" --enable-qt5"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
|
||||
@@ -312,10 +319,10 @@ echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS
|
||||
--with-qt5=/opt/gfa/python-3.7/latest \
|
||||
--with-qt4=/opt/gfa/python-3.5/latest \
|
||||
--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 \
|
||||
--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
|
||||
--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
|
||||
--with-curl=/sf/bd/deps/zmq/curl-7.55.1 \
|
||||
--with-lz4=/sf/bd/deps/zmq/lz4/lib \
|
||||
--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
|
||||
--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
|
||||
--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1 \
|
||||
--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib \
|
||||
--with-epics7=/usr/local/epics/${EPICS_BASE}
|
||||
unset CAFE_EPICS_V_PATCH
|
||||
unset CAFE_EPICS_V_MINOR
|
||||
|
||||
Reference in New Issue
Block a user