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
1a52415b
Commit
1a52415b
authored
Jun 04, 2015
by
Zach
Browse files
QT5 updated to 5.4.2
parent
1d08dc58
Changes
1
Hide whitespace changes
Inline
Side-by-side
travis-compile.sh
View file @
1a52415b
...
@@ -6,7 +6,7 @@ mkdir build
...
@@ -6,7 +6,7 @@ mkdir build
cd
build
cd
build
prefix
=
""
prefix
=
""
if
[[
$TRAVIS_OS_NAME
==
"osx"
&&
$QT4
==
0
]]
;
then
if
[[
$TRAVIS_OS_NAME
==
"osx"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.
1
/"
prefix
=
"-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.
2
/"
fi
fi
if
[[
$TRAVIS_OS_NAME
==
"linux"
&&
$QT4
==
0
]]
;
then
if
[[
$TRAVIS_OS_NAME
==
"linux"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
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