aboutsummaryrefslogtreecommitdiff
path: root/ciimage
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2017-08-31 20:38:15 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-31 21:38:15 +0300
commit35ef236c43cb196b706d6b3e62022c1b94b016f0 (patch)
tree388b5986df76b133b3372f870c53a6f24c8798bf /ciimage
parent5f0a91baa51a0403eb6db51d51e96430aaa1b716 (diff)
downloadmeson-35ef236c43cb196b706d6b3e62022c1b94b016f0.zip
meson-35ef236c43cb196b706d6b3e62022c1b94b016f0.tar.gz
meson-35ef236c43cb196b706d6b3e62022c1b94b016f0.tar.bz2
add support for cups dependencies (#2255)
* add support for cups dependencies libcups has its own cups-config tool rather than using pkg-config. This adds support for cups-config, based on pcap-config and sdl2-config implementations. This change also includes the unit test case and documentation for cups dependency object implementation, and libcups2 dep to CI image.
Diffstat (limited to 'ciimage')
-rw-r--r--ciimage/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile
index 2691900..1c9e8d8 100644
--- a/ciimage/Dockerfile
+++ b/ciimage/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get -y update && apt-get -y upgrade \
&& apt-get -y install python3-pip libxml2-dev libxslt1-dev cmake libyaml-dev \
&& apt-get -y install openmpi-bin libopenmpi-dev \
&& apt-get -y install libboost-log-dev \
-&& apt-get -y install libvulkan-dev libpcap-dev \
+&& apt-get -y install libvulkan-dev libpcap-dev libcups2-dev \
&& apt-get -y install gcovr lcov \
&& apt-get -y install gtk-sharp2 gtk-sharp2-gapi libglib2.0-cil-dev \
&& python3 -m pip install hotdoc codecov