Skip to content

Commit

Permalink
Fixed mistakes on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Zialus committed Dec 29, 2018
1 parent e9208f5 commit 4ff8b1b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,13 @@ matrix:
install:
# Install OpenCV
- choco install opencv
- export OPENCV_DIR=C:/tools/opencv/build/x64/vc15/
- export OPENCV_DIR=C:/tools/opencv/build/x64/vc15/lib
# Install Boost
- wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.7z
- 7z x boost_1_67_0.7z -o/C/local
- pushd "/C/local/boost_1_67_0"
- ./bootstrap.bat
- ./b2.exe --with-libraries=program_options,filesystem,system,thread,test,timer,chrono
- ./b2.exe --with-chrono --with-date_time --with-filesystem --with-program_options --with-system --with-thread --with-timer --with-test
- popd
# Install OpenCL headers and libraries
- choco install nuget.commandline
Expand Down Expand Up @@ -386,7 +386,7 @@ script:
- echo ${CMAKE_OPTIONS}
- echo ${CXX_FLAGS}
- if [[ ${TRAVIS_OS_NAME} != "windows" ]]; then cmake -G"${GENERATOR}" ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" .. ; fi
- if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR}" -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}".. ; fi
- if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR}" -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" .. ; fi
# https://stackoverflow.com/questions/39865367/warning-section-textcoal-nt-is-deprecate-since-updating-to-mac-osx-sierra
- if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then cmake --build . -j 4 --config Debug 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*' ; fi
- if [[ ${TRAVIS_OS_NAME} != "osx" ]]; then cmake --build . -j 4 --config Debug ; fi
Expand Down

0 comments on commit 4ff8b1b

Please sign in to comment.