Commit a2c03652 authored by locatelli's avatar locatelli
Browse files

Test on ubuntu22.04 LTS

parent 0749fc01
......@@ -14,6 +14,6 @@ cd build
export CXXFLAGS="-Wall -Wconversion -g -O2"
#../configure --prefix=`pwd`/.. --enable-debug
../configure --prefix=`pwd`/.. --enable-debug
# for Visa VM on Ubuntu --with-iconsdir=/tmp/nomad/cameo/ploty2 --with-settingsdir=/tmp/nomad/nomadgui-release
#make proto
make proto
......@@ -27,7 +27,7 @@ AC_DEFUN([AC_CAMEO],
for cameo_path_tmp in $cameo_possible_path ; do
# test include
CXXFLAGS="$CXXFLAGS -I$cameo_path_tmp/include"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cameo/cameo.h>]],[[]])],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cameo/api/cameo.h>]],[[]])],
[CAMEO_CFLAGS="-I$cameo_path_tmp/include"
CAMEO_LIBS="-L$cameo_path_tmp/lib"
cameo_found=yes]
......@@ -45,7 +45,7 @@ AC_DEFUN([AC_CAMEO],
CXXFLAGS="$CXXFLAGS $CAMEO_CFLAGS"
# search for library
LIBS="$LIBS $CAMEO_LIBS $LIBZMQ_LDFLAGS $LIBPROTOBUF_LDFLAGS $BOOST_LDFLAGS $LIBZMQ_LIB $LIBPROTOBUF_LIB $BOOST_THREAD_LIB -lcameo"
LIBS="$LIBS $CAMEO_LIBS $LIBZMQ_LDFLAGS $LIBPROTOBUF_LDFLAGS $BOOST_LDFLAGS $LIBZMQ_LIB $LIBPROTOBUF_LIB $BOOST_THREAD_LIB -lcameo-api-cpp"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
[[]])],
......
......@@ -17,7 +17,7 @@ AC_DEFUN([AC_LIBPYTHON],
if test $with_lib_python != yes; then
lib_python_possible_path="$with_lib_python"
else
lib_python_possible_path="3.5m 3.6m 3.7m 3.8"
lib_python_possible_path="3.10 3.8 3.7m 3.5m 3.6m"
fi
CXXFLAGSORG=$CXXFLAGS
......
......@@ -35,7 +35,7 @@ const sipAPIDef *sipAPI() {
static const sipAPIDef *sip_API = nullptr;
if (sip_API)
return sip_API;
sip_API = (const sipAPIDef *) PyCapsule_Import("sip._C_API", 0);
sip_API = (const sipAPIDef *) PyCapsule_Import("PyQt5.sip._C_API", 0);
return sip_API;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment