Skip to content

Commit 02e8752

Browse files
committed
Fixed mistakes on windows
1 parent e9208f5 commit 02e8752

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ matrix:
249249
install:
250250
# Install OpenCV
251251
- choco install opencv
252-
- export OPENCV_DIR=C:/tools/opencv/build/x64/vc15/
252+
- export OPENCV_DIR=C:/tools/opencv/build/x64/vc15/lib
253253
# Install Boost
254254
- wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.7z
255255
- 7z x boost_1_67_0.7z -o/C/local
256256
- pushd "/C/local/boost_1_67_0"
257257
- ./bootstrap.bat
258-
- ./b2.exe --with-libraries=program_options,filesystem,system,thread,test,timer,chrono
258+
- ./b2.exe --with-chrono --with-date_time --with-filesystem --with-program_options --with-system --with-thread --with-timer --with-test
259259
- popd
260260
# Install OpenCL headers and libraries
261261
- choco install nuget.commandline
@@ -386,7 +386,7 @@ script:
386386
- echo ${CMAKE_OPTIONS}
387387
- echo ${CXX_FLAGS}
388388
- if [[ ${TRAVIS_OS_NAME} != "windows" ]]; then cmake -G"${GENERATOR}" ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" .. ; fi
389-
- 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
389+
- if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR}" ${CMAKE_OPTIONS} .. ; fi
390390
# https://stackoverflow.com/questions/39865367/warning-section-textcoal-nt-is-deprecate-since-updating-to-mac-osx-sierra
391391
- 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
392392
- if [[ ${TRAVIS_OS_NAME} != "osx" ]]; then cmake --build . -j 4 --config Debug ; fi

0 commit comments

Comments
 (0)