From 2c5c2f67bbdb46d8c09b5ccb401a238bc3de83fe Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Fri, 9 Jun 2017 17:46:15 +0200
Subject: [PATCH] integrate libiec61850 into build system

---
 .dockerignore                   | 3 ++-
 packaging/docker/Dockerfile.dev | 4 ++++
 thirdparty/Makefile.inc         | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 024325812..552bc9355 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 *
 !build/release/packaging/rpm/*
-!thirdparty/
\ No newline at end of file
+!thirdparty/criterion/
+!thirdparty/libiec61850/
diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev
index 107cf2d5c..bf5b89b74 100644
--- a/packaging/docker/Dockerfile.dev
+++ b/packaging/docker/Dockerfile.dev
@@ -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
diff --git a/thirdparty/Makefile.inc b/thirdparty/Makefile.inc
index 2f1211e57..7e9bfb2e3 100644
--- a/thirdparty/Makefile.inc
+++ b/thirdparty/Makefile.inc
@@ -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