Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

integrate libiec61850 into build system

Browse source
This commit is contained in:
Steffen Vogel 2017-06-09 17:46:15 +02:00
parent fc5e66f165
commit 2c5c2f67bb
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.dockerignore
View file

@ -1,3 +1,4 @@
*
!build/release/packaging/rpm/*
!thirdparty/
!thirdparty/criterion/
!thirdparty/libiec61850/

4
packaging/docker/Dockerfile.dev
View file

@ -91,6 +91,10 @@ RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake -DCMAKE_IN
# Workaround for libnl3's search path for netem distributions
RUN ln -s /usr/lib64/tc /usr/lib/tc
# Build & Install libiec61850
COPY thirdparty/libiec61850 /tmp/libiec61850
RUN mkdir -p /tmp/libiec61850/build && cd /tmp/libiec61850/build && cmake -DBUILD_EXAMPLES=0 -DBUILD_PYTHON_BINDINGS=0 .. && make install
# Expose ports for HTTP and WebSocket frontend
EXPOSE 80
EXPOSE 443

3
thirdparty/Makefile.inc vendored
View file

@ -20,7 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###################################################################################
DEPS_CMAKE = libxil libwebsockets criterion jansson nanomsg
DEPS_CMAKE = libxil libwebsockets libiec61850 criterion jansson nanomsg
DEPS_AUTOCONF = libnl libconfig libcurl libzmq
DEPS = $(DEPS_CMAKE) $(DEPS_AUTOCONF)
@ -69,6 +69,7 @@ libconfig-fix:
rm -f $(SRCDIR)/thirdparty/libconfig/lib/scanner.[hc]
jansson: CMAKE_OPTS += -DJANSSON_BUILD_DOCS=OFF
libiec61850: CMAKE_OPTS += -DBUILD_EXAMPLES=0 -DBUILD_PYTHON_BINDINGS=0
libwebsockets: CMAKE_OPTS += -DLWS_IPV6=1 -DLWS_WITH_STATIC=0 -DLWS_WITHOUT_TESTAPPS=1 -DLWS_WITH_HTTP2=1 -DLWS_WITH_SERVER_STATUS=1
libzmq: CONFIGURE_OPTS += --with-libsodium --with-pgm --enable-drafts