Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
Ploty2
Commits
a2c03652
Commit
a2c03652
authored
May 13, 2022
by
locatelli
Browse files
Test on ubuntu22.04 LTS
parent
0749fc01
Changes
4
Hide whitespace changes
Inline
Side-by-side
build.sh
View file @
a2c03652
...
...
@@ -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
m4/cameo.m4
View file @
a2c03652
...
...
@@ -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([[]],
[[]])],
...
...
m4/libpython.m4
View file @
a2c03652
...
...
@@ -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.
6
m 3.
7
m 3.
8
"
lib_python_possible_path="3.
10 3.8
3.
7
m 3.
5
m 3.
6m
"
fi
CXXFLAGSORG=$CXXFLAGS
...
...
src/view/Sip.h
View file @
a2c03652
...
...
@@ -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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment