summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorhenrique <henrique@apache.org>2014-06-11 09:26:01 +0200
committerhenrique <henrique@apache.org>2014-06-11 09:28:17 +0200
commitbbac92453b4e89fe097a13bf5a1e358dab60b0bd (patch)
tree73df3d57b538af6ad5271f97a8657a5db034b1e1 /.travis.yml
parenta3570ac36716d0313e2c1c6143cfffc5ddae8fec (diff)
parent569863a1385c38eb937662aa655db1c3fb0819fe (diff)
downloadthrift-bbac92453b4e89fe097a13bf5a1e358dab60b0bd.tar.gz
THRIFT-2571 Simplify cross compilation using CMake
Patch: Pascal Bach This closes #137 ----
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 9bd9dfada..d54acc423 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,5 +71,7 @@ script:
- make -j2 && make dist
- make cross -j2
- sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
+ - mkdir build_native && cd build_native && cmake ../compiler/cpp/ && make; cd ..
+ - mkdir build_mingw32 && cd build_mingw32 && cmake -DCMAKE_TOOLCHAIN_FILE=../contrib/mingw32-toolchain.cmake ../compiler/cpp/ && make; cd ..
# TODO: add these steps
# - sh bootstrap.sh ; dpkg-buildpackage -tc