Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
903292ad
Commit
903292ad
authored
Jul 22, 2015
by
ctrlaltca
Browse files
Merge pull request #1288 from ctrlaltca/travis_qt5_homebrew
Hack to make travis always detect the installed qt5 version
parents
0d5e1696
713fa92c
Changes
1
Hide whitespace changes
Inline
Side-by-side
travis-compile.sh
View file @
903292ad
...
...
@@ -6,7 +6,7 @@ mkdir build
cd
build
prefix
=
""
if
[[
$TRAVIS_OS_NAME
==
"osx"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.
4.2/
"
prefix
=
"-DCMAKE_PREFIX_PATH=
`
echo
/usr/local/Cellar/qt5/5.
*
/
`
"
fi
if
[[
$TRAVIS_OS_NAME
==
"linux"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment