diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2018-10-23 19:58:07 +0200 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-10-23 10:58:07 -0700 |
| commit | 546d4300e907d7152a961c18daaea580e25765a3 (patch) | |
| tree | 7451ce5aa1dd4fe054b3c15f4452f72bb78596ce | |
| parent | f6db3ba495964985a0e7ddddaec6a8e070d70d85 (diff) | |
| download | navit-546d4300e907d7152a961c18daaea580e25765a3.tar.gz | |
circleci:add ppa for cmake 3.x on win32 target (#702)
* circleic:add ppa for cmake 3.x on win32 target
* Update config.yml
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | scripts/build_win32.sh | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 46d1aad86..eecf98b57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,6 +161,10 @@ jobs: name: Build for Windows command: | apt-get update && xargs -a scripts/setup_14.04_requirements.list apt-get install -y + apt-get install -y software-properties-common + add-apt-repository -y ppa:george-edison55/cmake-3.x + apt-get remove -y cmake + apt-get install -y cmake3 bash scripts/build_win32.sh - store_artifacts: path: win32/navit.exe diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh index 3fbe81d1d..6e42d6ed4 100644 --- a/scripts/build_win32.sh +++ b/scripts/build_win32.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e export nixpaste="curl -F 'text=<-' http://nixpaste.lbr.uno" + apt-get update && apt-get install -y mingw-w64 mingw-w64-tools \ default-jdk nsis libsaxonb-java curl |