r/sustaining_gazes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

More travis fix attempts.

Browse source
This commit is contained in:
Tadas Baltrusaitis 2016-12-19 14:59:25 -05:00
parent 4d886b4112
commit b9e6f53141
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -15,14 +15,14 @@ os:
before_install: before_install:
# g++4.8.1 # g++4.8.1
- if [ "$CXX" == "g++" ]; then - if [ "$CXX" = "g++" ]; then
if [[ ${TRAVIS_OS_NAME} = linux ]]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
fi fi
fi fi
# clang 3.4 # clang 3.4
- if [ "$CXX" == "clang++" ]; then - if [ "$CXX" = "clang++" ]; then
if [[ ${TRAVIS_OS_NAME} = linux ]]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then
sudo add-apt-repository -y ppa:h-rayflood/llvm; sudo add-apt-repository -y ppa:h-rayflood/llvm;
fi fi
@ -55,7 +55,7 @@ before_script:
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd opencv; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd opencv; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then mkdir build; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then mkdir build; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd build; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd build; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_SHARED_LIBS=OFF ..; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cmake -D CMAKE_BUILD_TYPE=RELEASE -D BUILD_SHARED_LIBS=OFF ..; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then make -j2; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then make -j2; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo make -j2 install; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo make -j2 install; fi
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd ../..; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd ../..; fi

3
CMakeLists.txt
View file

@ -6,6 +6,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
find_package( OpenCV REQUIRED ) find_package( OpenCV REQUIRED )
find_package( OpenCV HINTS /usr/local/Cellar/opencv3/3.1.0_4/ )
find_package( OpenCV HINTS /usr/local/Cellar/opencv3/3.1.0_3/ )
MESSAGE("OpenCV information:") MESSAGE("OpenCV information:")
MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}") MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")
MESSAGE(" OpenCV_LIBRARIES: ${OpenCV_LIBRARIES}") MESSAGE(" OpenCV_LIBRARIES: ${OpenCV_LIBRARIES}")