Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lst-data-process-128
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lst
lst-data-process-128
Commits
45adfa1d
Commit
45adfa1d
authored
6 years ago
by
legoc
Browse files
Options
Downloads
Patches
Plain Diff
Changed dependencies to cameo for C++11
parent
b2b3f0d5
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG
+5
-0
5 additions, 0 deletions
CHANGELOG
configure.ac
+4
-3
4 additions, 3 deletions
configure.ac
m4/cameo.m4
+3
-6
3 additions, 6 deletions
m4/cameo.m4
m4/gnuplot.m4
+4
-2
4 additions, 2 deletions
m4/gnuplot.m4
with
16 additions
and
11 deletions
CHANGELOG
+
5
−
0
View file @
45adfa1d
Version 1.3.1,
-------------------------
- Cameo C++11
Version 1.3.0, 2018-12-18
-------------------------
- Corrected masks for eventEnergy() function according to the number of bits defined.
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
4
−
3
View file @
45adfa1d
...
...
@@ -65,10 +65,11 @@ AC_SUBST(ROOT_LDFLAGS)
ROOT_CFLAGS=`root-config --cflags`
AC_SUBST(ROOT_CFLAGS)
AM_COND_IF([CAMEO], [AX_BOOST_BASE([1.41],, [AC_MSG_ERROR([Boost 1.41 required])])
AC_CAMEO
AM_COND_IF([CAMEO], [AC_CAMEO])
AM_COND_IF([GNUPLOT], [AX_BOOST_BASE([1.41],, [AC_MSG_ERROR([Boost 1.41 required])])
AC_GNUPLOT
])
AM_COND_IF([GNUPLOT], [AC_GNUPLOT])
LST_CXXFLAGS="$BOOST_CPPFLAGS \
$ZMQ_CFLAGS \
...
...
This diff is collapsed.
Click to expand it.
m4/cameo.m4
+
3
−
6
View file @
45adfa1d
###############################################################################
# Version
11
/0
7
/201
6
# Version
29
/0
4
/201
9
# defines CAMEO_CFLAGS, CAMEO_LDFLAGS, CAMEO_LIBS
#
AC_DEFUN([AC_CAMEO],
...
...
@@ -11,9 +11,6 @@ AC_DEFUN([AC_CAMEO],
AC_LIBZMQ
AC_LIBPROTOBUF_LITE
AX_BOOST_SYSTEM
AX_BOOST_DATE_TIME
AX_BOOST_THREAD
CAMEO_CFLAGS=
CAMEO_LIBS=
...
...
@@ -47,7 +44,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 $LIBZMQ_LIB $LIBPROTOBUF_LIB -lcameo"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
[[]])],
...
...
@@ -60,7 +57,7 @@ AC_DEFUN([AC_CAMEO],
HAVE_CAMEO=1
LIBS="$cameo_save_LIBS"
CAMEO_LDFLAGS="$LIBZMQ_LDFLAGS $LIBPROTOBUF_LDFLAGS $CAMEO_LIBS"
CAMEO_LIBS="$LIBZMQ_LIB $LIBPROTOBUF_LIB
$BOOST_THREAD_LIB -lcameo
"
CAMEO_LIBS="
-lcameo
$LIBZMQ_LIB $LIBPROTOBUF_LIB
-pthread
"
fi
if test $cameo_found = yes; then
...
...
This diff is collapsed.
Click to expand it.
m4/gnuplot.m4
+
4
−
2
View file @
45adfa1d
###############################################################################
# Version
02/12
/201
6
# Version
29/04
/201
9
# defines GNUPLOT_CFLAGS, GNUPLOT_LDFLAGS, GNUPLOT_LIBS
#
AC_DEFUN([AC_GNUPLOT],
[
[
AX_BOOST_SYSTEM
GNUPLOT_CFLAGS=
GNUPLOT_LDFLAGS=
GNUPLOT_LIBS=-lboost_iostreams
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment