diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2018-10-20 08:15:27 +0200 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-10-19 23:15:27 -0700 |
| commit | ce949480009e8ac4df6e81173c4e312958913605 (patch) | |
| tree | a9c6cee1e88b19d92cd228ea90e274356088d258 /.circleci | |
| parent | d1eefc90619a6357e7a52f1145f961182674d813 (diff) | |
| download | navit-ce949480009e8ac4df6e81173c4e312958913605.tar.gz | |
Refactoring:navit/maptool:build with external protobuf-c (#650)
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 69facbbae..46d1aad86 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ jobs: name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config command: | sudo apt-get update - sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config + sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler cmake ./ -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 - run: name: Process icons @@ -160,7 +160,7 @@ jobs: - run: name: Build for Windows command: | - bash scripts/setup_common_requirements.sh + apt-get update && xargs -a scripts/setup_14.04_requirements.list apt-get install -y bash scripts/build_win32.sh - store_artifacts: path: win32/navit.exe |