summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2020-08-13 00:45:36 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-08-17 17:09:39 +0000
commitb67b08f1c2c26a226db6f43f2452026f85ad6460 (patch)
treee8aa41c51e6247919d531d9cd35737c98a360ff9 /docker
parent2311a8224c3fc7141c44cc517f4ecdb882cd09f8 (diff)
downloadqbs-b67b08f1c2c26a226db6f43f2452026f85ad6460.tar.gz
Initial CMake port
This change allows to build Qbs using CMake build tool Tested platforms - Linux (gcc) - macOS (clang) - Windows (msvc2017) Missing features (compared to Qbs build) - Documentation build - Bundled QtScript support - Static build - .pc file for qbscore - qbs module for qbscore Change-Id: I09b5dadd6723d5a47e5ef2a9a38d3300488718f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker')
-rw-r--r--docker/bionic/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index ab05c90a7..9fee903dd 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update -qq && \
ccache \
clang-8 \
clang-tidy-8 \
+ cmake \
curl \
flex \
git \
@@ -55,6 +56,7 @@ RUN apt-get update -qq && \
libgl1-mesa-glx \
libprotobuf-dev \
libgrpc++-dev \
+ ninja-build \
nsis \
pkg-config \
protobuf-compiler \