sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix travis and appveyor buildbots

Browse source
This commit is contained in:
Balazs Benics 2019-07-27 19:56:00 +02:00 committed by Daniil Goncharov
parent 6f6871dd4b
commit 18a7bb7f8c
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.appveyor.yml
View file

@ -20,11 +20,26 @@ environment:
matrix: matrix:
- GENERATOR: "Visual Studio 15 2017" - GENERATOR: "Visual Studio 15 2017"
install:
# getting Catch2 library
# redirect stderr to fix appveyor handling stderr
- ps: $env:GIT_REDIRECT_STDERR = '2>&1'
- ps: git clone https://github.com/catchorg/Catch2.git
- ps: cd Catch2
- ps: git checkout v2.9.1
- ps: mkdir build
- ps: cd build
- ps: pwd
- ps: cmake -DCATCH_BUILD_TESTING=OFF -DCATCH_INSTALL_DOCS=OFF -DCATCH_INSTALL_HELPERS=OFF -DCMAKE_INSTALL_PREFIX="$PWD/../installed" ..
- ps: cmake --build . --target install --config Release
- ps: cd ../..
before_build: before_build:
- if exist build RMDIR /S /Q build - if exist build RMDIR /S /Q build
- if not exist build mkdir build - if not exist build mkdir build
- cd build - cd build
- cmake -G "%GENERATOR%" -A %PLATFORM% .. - pwd
- cmake -G "%GENERATOR%" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="C:/projects/nameof/Catch2/installed" ..
build_script: build_script:
- cmake --build . --config %CONFIGURATION% - cmake --build . --config %CONFIGURATION%

14
.travis.yml
View file

@ -107,6 +107,17 @@ install:
- export CXX=${CXX_COMPILER} - export CXX=${CXX_COMPILER}
- JOBS=2 # Travis machines have 2 cores. - JOBS=2 # Travis machines have 2 cores.
- | - |
# getting Catch2 library
git clone https://github.com/catchorg/Catch2.git
cd Catch2
git checkout v2.9.1
mkdir build
cd build
pwd
cmake -DCATCH_BUILD_TESTING=OFF -DCATCH_INSTALL_DOCS=OFF -DCATCH_INSTALL_HELPERS=OFF -DCMAKE_INSTALL_PREFIX=../installed ..
cmake --build . --target install --config Release
cd ../..
# If linux and clang install the right version of libc++. # If linux and clang install the right version of libc++.
if [[ "${TRAVIS_OS_NAME}" == "linux" && "${CXX%%+*}" == "clang" && -n "$(ls -A ${LLVM_INSTALL})" ]]; then if [[ "${TRAVIS_OS_NAME}" == "linux" && "${CXX%%+*}" == "clang" && -n "$(ls -A ${LLVM_INSTALL})" ]]; then
LLVM_INSTALL=${DEPS_DIR}/llvm/install LLVM_INSTALL=${DEPS_DIR}/llvm/install
@ -140,7 +151,8 @@ before_script:
- rm -rf build - rm -rf build
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake -G "Unix Makefiles" .. - pwd
- cmake -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=../Catch2/installed ..
script: script:
- cmake --build . -- -j${JOBS} - cmake --build . -- -j${JOBS}