diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | build/cmake/README.md | 2 | ||||
| -rw-r--r-- | build/cmake/mingw32-toolchain.cmake (renamed from contrib/mingw32-toolchain.cmake) | 0 | ||||
| -rw-r--r-- | compiler/cpp/README.md | 2 |
4 files changed, 4 insertions, 4 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" diff --git a/build/cmake/README.md b/build/cmake/README.md index 311ef154a..ebc4f7da1 100644 --- a/build/cmake/README.md +++ b/build/cmake/README.md @@ -20,7 +20,7 @@ just do this: if you use a specific toolchain pass it to cmake, the same for options: - cmake -DCMAKE_TOOLCHAIN_FILE=${THRIFT_SRC}/contrib/mingw32-toolchain.cmake .. + cmake -DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake .. cmake -DCMAKE_C_COMPILER=clang-3.5 -DCMAKE_CXX_COMPILER=clang++-3.5 .. cmake -DTHRIFT_COMPILER_HS=OFF .. cmake -DWITH_ZLIB=ON .. diff --git a/contrib/mingw32-toolchain.cmake b/build/cmake/mingw32-toolchain.cmake index 0fc1efaf5..0fc1efaf5 100644 --- a/contrib/mingw32-toolchain.cmake +++ b/build/cmake/mingw32-toolchain.cmake diff --git a/compiler/cpp/README.md b/compiler/cpp/README.md index b4a159f1e..2c0a67c1b 100644 --- a/compiler/cpp/README.md +++ b/compiler/cpp/README.md @@ -20,7 +20,7 @@ Now open the folder build_ec using eclipse. ### Cross compile using mingw32 and generate a Windows Installer with CPack mkdir build_mingw32 && cd build_mingw32 - cmake -DCMAKE_TOOLCHAIN_FILE=../../../contrib/mingw32-toolchain.cmake .. + cmake -DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake .. cpack ## Build on windows |