From 9bf00035449dfa553214d327d7cac3b27059223d Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 23 Jan 2020 18:04:27 +0000 Subject: [PATCH] Try to fix the Travis build --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f9f2deb..8eba6482 100644 --- a/.travis.yml +++ b/.travis.yml @@ -170,14 +170,19 @@ install: before_script: # Make build directory and generate CMake build files - - mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR} - - $mingw32 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON - - cd .. - | if [ "${TRAVIS_OS_NAME}" == "windows" ]; then + mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR} + $mingw32 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON -G"Unix Makefiles" + cd .. + mkdir -p ${CMAKE_BUILD_DIR2} && cd ${CMAKE_BUILD_DIR2} - $mingw64 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON + $mingw64 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON -G"Unix Makefiles" + cd .. + else + mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR} + cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON cd .. fi