diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-09-04 19:38:19 +0200 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-09-04 19:38:19 +0200 |
commit | cf1176c7286657e4c56cbd5bc599ba85482317b9 (patch) | |
tree | 4e989fd5b54324f5a9801ec00560f0fe3267e8b2 | |
parent | 6ae6875bbafd3b3c8133095312e28a9583bf7845 (diff) | |
download | sway-cf1176c7286657e4c56cbd5bc599ba85482317b9.tar.xz |
Build wlc as part of build step
-rwxr-xr-x | .ci/build.sh | 17 | ||||
-rw-r--r-- | .travis.yml | 13 |
2 files changed, 26 insertions, 4 deletions
diff --git a/.ci/build.sh b/.ci/build.sh new file mode 100755 index 00000000..e2d2ced9 --- /dev/null +++ b/.ci/build.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# clone and build wlc +git clone https://github.com/Cloudef/wlc.git +cd wlc +git submodule update --init --recursive # - initialize and fetch submodules +mkdir target && cd target # - create build target directory +cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake +make # - compile + +cd ../.. + +# build sway +cmake \ + -DWLC_LIBRARIES=wlc/target/src/libwlc.so \ + -DWLC_INCLUDE_DIRS=wlc/include . +make diff --git a/.travis.yml b/.travis.yml index 2f6e93dd..5d1f8faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,16 @@ arch: - asciidoc - pcre - json-c - # aur - - wlc-git + - pixman + - wayland + - libxkbcommon + - libinput + - libx11 + - libxcb + - libgl + - mesa script: - - "cmake ." - - "make" + - "bash .ci/build.sh" script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" |