Skip to content

GitLab

Commit 46f46b8a authored by locatelli's avatar locatelli
Browse files

ubuntu compilation

parent 1445cd9f
Hide whitespace changes
Inline Side-by-side
.settings/language.settings.xml
View file @ 46f46b8a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
<configuration id="cdt.managedbuild.toolchain.gnu.base.496976749" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1873340393523510488" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project>
<configuration id="cdt.managedbuild.toolchain.gnu.base.496976749" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1765399521048313882" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project>
\ No newline at end of file
configure.ac
View file @ 46f46b8a
......@@ -64,7 +64,7 @@ AX_BOOST_THREAD
AX_BOOST_RANDOM
AC_LIBPYTHON
AC_LIBBOOST_PYTHON_PY
AC_LIBBOOST_PYTHON
AC_LIBQT5CORE
AC_LIBQT5GUI
AC_LIBQT5WIDGETS
......@@ -72,7 +72,7 @@ AC_CAMEO
RM_CXXFLAGS="$BOOST_CPPFLAGS \
$LIBPYTHON_CPPFLAGS \
$LIBBOOST_PYTHON_PY_CPPFLAGS \
$LIBBOOST_PYTHON_CPPFLAGS \
$LIBQT5CORE_CPPFLAGS \
$LIBQT5GUI_CPPFLAGS \
$LIBQT5WIDGETS_CPPFLAGS \
......@@ -80,14 +80,14 @@ RM_CXXFLAGS="$BOOST_CPPFLAGS \
RM_LDFLAGS="$BOOST_LDFLAGS \
$LIBPYTHON_LDFLAGS \
$LIBBOOST_PYTHON_PY_LDFLAGS \
$LIBBOOST_PYTHON_LDFLAGS \
$LIBQT5CORE_LDFLAGS \
$LIBQT5GUI_LDFLAGS \
$LIBQT5WIDGETS_LDFLAGS \
$CAMEO_LDFLAGS"
RM_LIBS="$LIBPYTHON_LIB \
$LIBBOOST_PYTHON_PY_LIB \
$LIBBOOST_PYTHON_LIB \
$BOOST_SYSTEM_LIB \
$BOOST_FILESYSTEM_LIB \
$BOOST_THREAD_LIB \
......
debian/changelog
View file @ 46f46b8a
......@@ -2,26 +2,26 @@ ploty2 (1.3-2) unstable; urgency=medium
* Correct bug missing init of value xsize , ysize, size for getting plot type
-- ics <j.locatelli@ill.fr> Tue, 24 August 2021 08:30:00 +0200
-- ics <j.locatelli@ill.fr> Tue, 24 Aug 2021 08:30:00 +0200
ploty2 (1.3-1) unstable; urgency=medium
* Add RGB plot
-- ics <j.locatelli@ill.fr> Wed, 4 August 2021 10:30:00 +0200
-- ics <j.locatelli@ill.fr> Wed, 4 Aug 2021 10:30:00 +0200
ploty2 (1.2-4) unstable; urgency=medium
* remove using serverEndpoint property
* add try catch when ParseFromString PlotPropertyDataMessage from gui
-- ics <j.locatelli@ill.fr> Wed, 22 April 2021 16:30:00 +0200
-- ics <j.locatelli@ill.fr> Wed, 22 Apr 2021 16:30:00 +0200
ploty2 (1.2-3) unstable; urgency=medium
* Add nb plot for adding or deleting roi on data plot server object
-- ics <j.locatelli@ill.fr> Wed, 20 April 2021 16:30:00 +0200
-- ics <j.locatelli@ill.fr> Wed, 20 Apr 2021 16:30:00 +0200
ploty2 (1.2-2) unstable; urgency=medium
......@@ -29,13 +29,13 @@ ploty2 (1.2-2) unstable; urgency=medium
* Correct bug using min and max contrast in offscreen
* resize y when log action in plot1d
-- ics <j.locatelli@ill.fr> Wed, 10 October 2021 08:30:00 +0200
-- ics <j.locatelli@ill.fr> Wed, 10 Oct 2021 08:30:00 +0200
ploty2 (1.1-2) unstable; urgency=medium
* Change minimal size of widget QtColorMap
-- ics <j.locatelli@ill.fr> Mon, 10 Janvier 2020 09:00:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 10 Jan 2020 09:00:00 +0200
ploty2 (1.1-1) unstable; urgency=medium
......@@ -62,44 +62,44 @@ ploty2 (1.0-12) unstable; urgency=medium
* Use nomadSenddata for sending image and not nomadNotifications
-- ics <j.locatelli@ill.fr> Mon, 28 August 2020 14:20:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 28 Aug 2020 14:20:00 +0200
ploty2 (1.0-11) unstable; urgency=medium
* Catch send image error, so in case of sending error keep pb file for a future recovery
* set send image message to verbose
-- ics <j.locatelli@ill.fr> Mon, 28 August 2020 08:30:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 28 Aug 2020 08:30:00 +0200
ploty2 (1.0-10) unstable; urgency=medium
* Plot1d bug: do set_ydata and set_xdata if data sise is increasing to 1
-- ics <j.locatelli@ill.fr> Mon, 21 August 2020 09:30:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 21 Aug 2020 09:30:00 +0200
ploty2 (1.0-9) unstable; urgency=medium
* Don't crashed when log sender if png file doesn't existed
-- ics <j.locatelli@ill.fr> Mon, 14 August 2020 15:00:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 14 Aug 2020 15:00:00 +0200
ploty2 (1.0-8) unstable; urgency=medium
* set in debug
-- ics <j.locatelli@ill.fr> Mon, 14 August 2020 13:00:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 14 Aug 2020 13:00:00 +0200
ploty2 (1.0-7) unstable; urgency=medium
* Don't reset limits when there is a zoom or a pan for property plot 1d
-- ics <j.locatelli@ill.fr> Mon, 20 July 2020 16:00:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 20 Jul 2020 16:00:00 +0200
ploty2 (1.0-6) unstable; urgency=medium
* Add token stuff
-- ics <j.locatelli@ill.fr> Mon, 20 July 2020 16:00:00 +0200
-- ics <j.locatelli@ill.fr> Mon, 20 Jul 2020 16:00:00 +0200
ploty2 (1.0-5) unstable; urgency=medium
......
m4/libboost_python_py.m4 → m4/libboost_python.m4
View file @ 46f46b8a
###############################################################################
# Version 01/07/2015
# defines LIBBOOST_PYTHON_PY_CPPFLAGS, LIBBOOST_PYTHON_PY_LDFLAGS, LIBBOOST_PYTHON_PY_LIB
# defines LIBBOOST_PYTHON_CPPFLAGS, LIBBOOST_PYTHON_LDFLAGS, LIBBOOST_PYTHON_LIB
#
AC_DEFUN([AC_LIBBOOST_PYTHON_PY],
AC_DEFUN([AC_LIBBOOST_PYTHON],
[
AC_ARG_WITH([libboost_python_py],
AS_HELP_STRING([--with-libboost_python_py=PREFIX],[Specify lib python library location]),
AC_ARG_WITH([libboost_python],
AS_HELP_STRING([--with-libboost_python=PREFIX],[Specify lib python library location]),
[],
[with_libboost_python_py=yes])
[with_libboost_python=yes])
LIBBOOST_PYTHON_PY_LIBS=
LIBBOOST_PYTHON_PY_FLAGS=
LIBBOOST_PYTHON_LIBS=
LIBBOOST_PYTHON_FLAGS=
LIB=
libboost_python_py_save_LIBS="$LIBS"
if test $with_libboost_python_py != no; then
if test $with_libboost_python_py != yes; then
libboost_python_path="$with_libboost_python_py"
libboost_python_save_LIBS="$LIBS"
if test $with_libboost_python != no; then
if test $with_libboost_python != yes; then
libboost_python_path="$with_libboost_python"
else
libboost_python_path="/usr/lib/x86_64-linux-gnu"
fi
LDFLAGS_SAVED="$LDFLAGS"
AC_MSG_CHECKING([for libboost_python_py -lboost_python3-py3x])
LDFLAGS="$LDFLAGS_SAVED -lpython3.`ls -r $libboost_python_path/libboost_python-py3*.so 2>/dev/null | sed 's,.*/libboost_python-py3,,' | sed 's,\..*,,'`m"
AC_MSG_CHECKING([for libboost_python -lboost_python3x])
LDFLAGS="$LDFLAGS_SAVED -lpython3.`ls -r $libboost_python_path/libboost_python3*.so 2>/dev/null | sed 's,.*/libboost_python3,,' | sed 's,\..*,,'`"
export LDFLAGS
for libextension in `ls -r $libboost_python_path/libboost_python-py3* 2>/dev/null | sed 's,.*/lib,,'| sed 's,\..*,,'` ; do
for libextension in `ls -r $libboost_python_path/libboost_python3* 2>/dev/null | sed 's,.*/lib,,'| sed 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[LIB="-l$ax_lib"; libboost_python_py_found="yes"; break],
[libboost_python_py_found="no"])
[LIB="-l$ax_lib"; libboost_python_found="yes"; break],
[libboost_python_found="no"])
done
if test "x$libboost_python_py_found" != "xyes"; then
LDFLAGS="$LDFLAGS_SAVED -lpython3.`ls -r $libboost_python_path/libboost_python3-py3*.so 2>/dev/null | sed 's,.*/libboost_python3-py3,,' | sed 's,\..*,,'`m"
if test "x$libboost_python_found" != "xyes"; then
LDFLAGS="$LDFLAGS_SAVED -lpython3.`ls -r $libboost_python_path/libboost_python3*.so 2>/dev/null | sed 's,.*/libboost_python3,,' | sed 's,\..*,,'`"
export LDFLAGS
for libextension in `ls -r $libboost_python_path/libboost_python3-py3* 2>/dev/null | sed 's,.*/lib,,'| sed 's,\..*,,'` ; do
for libextension in `ls -r $libboost_python_path/libboost_python3* 2>/dev/null | sed 's,.*/lib,,'| sed 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[LIB="-l$ax_lib"; libboost_python_py_found="yes"; break],
[libboost_python_py_found="no"])
[LIB="-l$ax_lib"; libboost_python_found="yes"; break],
[libboost_python_found="no"])
done
fi
if test $libboost_python_py_found = yes; then
if test $libboost_python_found = yes; then
LIBBOOST_PYTHON_PY_CPPFLAGS="$LIBBOOST_PYTHON_PY_FLAGS"
LIBBOOST_PYTHON_PY_LDFLAGS="$LIBBOOST_PYTHON_PY_LIBS"
LIBBOOST_PYTHON_PY_LIB="$LIB"
LIBBOOST_PYTHON_CPPFLAGS="$LIBBOOST_PYTHON_FLAGS"
LIBBOOST_PYTHON_LDFLAGS="$LIBBOOST_PYTHON_LIBS"
LIBBOOST_PYTHON_LIB="$LIB"
AC_MSG_RESULT(yes)
AC_SUBST(LIBBOOST_PYTHON_PY_LDFLAGS)
AC_SUBST(LIBBOOST_PYTHON_PY_LIB)
AC_SUBST(LIBBOOST_PYTHON_LDFLAGS)
AC_SUBST(LIBBOOST_PYTHON_LIB)
else
AC_MSG_RESULT(no)
fi
LDFLAGS="$LDFLAGS_SAVED"
fi
LIBS="$libboost_python_py_save_LIBS"
LIBS="$libboost_python_save_LIBS"
])
m4/libpython.m4
View file @ 46f46b8a
......@@ -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"
lib_python_possible_path="3.5m 3.6m 3.7m 3.8"
fi
lib_python_found=no
......
m4/libtool.m4
View file @ 46f46b8a
......@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
$AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
$AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
......@@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
: ${AR_FLAGS=cru}
: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
......@@ -4704,6 +4704,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......
Markdown is supported
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