diff options
| author | Roger Meier <roger@apache.org> | 2015-05-15 16:21:41 +0200 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2015-05-16 21:09:18 +0200 |
| commit | 4ead520841dce57532c45378fba10b3e033bbf54 (patch) | |
| tree | ef824d8e1ad02d0db19790097c98eabc9f760af2 /.travis.yml | |
| parent | fc8a6a5187a0fbed3e0b758f41116201a89913e0 (diff) | |
| download | thrift-4ead520841dce57532c45378fba10b3e033bbf54.tar.gz | |
THRIFT-3155 move contrib/mingw32-toolchain.cmake to build/cmake/
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fbd3bad99..e897304d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ env: - TEST_NAME="C++/std-threads (CMake + CPack)" CMAKE_CONFIG="-DCMAKE_CXX_FLAGS=-std=c++0x -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_STDTHREADS=ON" - TEST_NAME="compiler (mingw32-gcc, CMake + CPack)" - CMAKE_CONFIG="-DCMAKE_TOOLCHAIN_FILE=../contrib/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF" + CMAKE_CONFIG="-DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF" # Autotool builds # TODO: Remove them as migration is made @@ -109,7 +109,7 @@ matrix: # Does not use native compiler, no need to do it twice - compiler: gcc - env: TEST_NAME="compiler (mingw32-gcc, CMake + CPack)" CMAKE_CONFIG="-DCMAKE_TOOLCHAIN_FILE=../contrib/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF" + env: TEST_NAME="compiler (mingw32-gcc, CMake + CPack)" CMAKE_CONFIG="-DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF" - compiler: gcc env: TEST_NAME="dist (automake)" CONFIG="" ALL_DEPS="yes" MAKE_TARGET="dist" |