THRIFT-2571 Simplify cross compilation using CMake
authorhenrique <henrique@apache.org>
Wed, 11 Jun 2014 07:26:01 +0000 (09:26 +0200)
committerhenrique <henrique@apache.org>
Wed, 11 Jun 2014 07:28:17 +0000 (09:28 +0200)
Patch: Pascal Bach

    This closes #137

----

1  2 
.travis.yml

diff --cc .travis.yml
@@@ -68,8 -69,10 +68,10 @@@ install
  script:
  # TODO: fix these languages
    - sh configure --without-erlang --without-haskell --without-python --without-go --without-lua
 -  - make -j$NUM_CPU && make dist
 -  - make cross -j$NUM_CPU
 +  - 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