Skip to content

Commit 2d537ab

Browse files
committed
Travis: fixed cmake env when build on osx
1 parent db2a351 commit 2d537ab

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

tools/travis.build.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@ set -x
77
mkdir -p ${AVTRANSCODER_BUILD_PATH}
88
cd ${AVTRANSCODER_BUILD_PATH}
99

10-
# Customize environment
11-
if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
12-
# Ask cmake to search in all dependencies we've installed manually
13-
export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH}
14-
elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
15-
# Ask cmake to search in all homebrew packages
16-
export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/${DEPENDENCY_NAME}/* | sed 's/ /;/g')
17-
fi
10+
# Ask cmake to search in all dependencies we've installed manually
11+
export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH}
1812

1913
# Build avTranscoder
2014
cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}

0 commit comments

Comments
 (0)