THRIFT-2571 Simplify cross compilation using CMake
Patch: Pascal Bach
This closes #137
----
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bbac9245
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bbac9245
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bbac9245
Branch: refs/heads/master
Commit: bbac92453b4e89fe097a13bf5a1e358dab60b0bd
Parents: a3570ac 569863a
Author: henrique <[email protected]>
Authored: Wed Jun 11 09:26:01 2014 +0200
Committer: henrique <[email protected]>
Committed: Wed Jun 11 09:28:17 2014 +0200
----------------------------------------------------------------------
.travis.yml | 2 +
compiler/cpp/CMakeLists.txt | 152 +++++++++++++++++++++++++++++++++++
compiler/cpp/README.md | 19 +++++
contrib/mingw32-toolchain.cmake | 19 +++++
4 files changed, 192 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bbac9245/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index 9bd9dfa,d40e81c..d54acc4
--- a/.travis.yml
+++ b/.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
