Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
f6103f6a
Commit
f6103f6a
authored
May 10, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Попытка исправить сборку в "Travis CI"
parent
717f4e57
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
.travis.yml
.travis.yml
+1
-1
configure.ac
configure.ac
+14
-1
Makefile.am
src/Processes/Makefile.am
+2
-2
No files found.
.travis.yml
View file @
f6103f6a
...
...
@@ -33,7 +33,7 @@ before_script:
# due broken comedi
-
export CXXFLAGS="$CXXFLAGS -Wl,--unresolved-symbols=ignore-in-shared-libs"
-
autoreconf -fiv
-
./configure --enable-tests --enable-mysql --enable-sqlite --enable-rrd --enable-io --enable-logicproc --disable-python --disable-mqtt
-
./configure --enable-tests --enable-mysql --enable-sqlite --enable-rrd --enable-io --enable-logicproc --disable-python --disable-mqtt
--disable-pkgchecklibev
script
:
-
if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make ; fi
...
...
configure.ac
View file @
f6103f6a
...
...
@@ -41,8 +41,21 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
PKG_CHECK_MODULES(OMNI, omniORB4)
PKG_CHECK_MODULES(SIGC, sigc++-2.0)
PKG_CHECK_MODULES(COMCPP, libccgnu2)
PKG_CHECK_MODULES(EV, libev)
nopkgchecklibev=false
AC_ARG_ENABLE(pkgchecklibev, AC_HELP_STRING([--disable-pkgchecklibev], [disable pkg check modules for libev]),
[ if test $enableval = yes; then nopkgchecklibev=false; else nopkgchecklibev=true; fi],[ nopkgchecklibev=false; ])
if test ${nopkgchecklibev} = false; then
PKG_CHECK_MODULES(EV, libev)
else
AC_CHECK_HEADER(ev++.h,,exit)
AC_CHECK_LIB([ev],ev_run,,exit)
EV_LIBS="-lev"
EV_CFLAGS=
AC_SUBST(EV_LIBS)
AC_SUBST(EV_CFLAGS)
fi
#check sqlite support
AC_MSG_CHECKING([sqlite support])
...
...
src/Processes/Makefile.am
View file @
f6103f6a
...
...
@@ -3,8 +3,8 @@
############################################################################
noinst_LTLIBRARIES
=
libProcesses.la
libProcesses_la_CXXFLAGS
=
$(SIGC_CFLAGS)
libProcesses_la_LIBADD
=
$(SIGC_LIBS)
libProcesses_la_CXXFLAGS
=
$(SIGC_CFLAGS)
$(EV_CFLAGS)
libProcesses_la_LIBADD
=
$(SIGC_LIBS)
$(EV_LIBS)
libProcesses_la_SOURCES
=
IOController_iSK.cc IOController.cc IONotifyController.cc
\
NCRestorer.cc NCRestorer_XML.cc EventLoopServer.cc CommonEventLoop.cc
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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