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
eacd06d2
Commit
eacd06d2
authored
Dec 26, 2014
by
ctrlaltca
Browse files
Merge pull request #503 from ctrlaltca/travis_osx_qt5
Fix travis compilation with osx+qt5
parents
776d809f
49310b52
Changes
1
Hide whitespace changes
Inline
Side-by-side
travis-compile.sh
View file @
eacd06d2
...
...
@@ -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.
3.2
/"
prefix
=
"-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.
4.0
/"
fi
cmake ..
-DWITH_SERVER
=
1
-DWITH_QT4
=
$QT4
$prefix
make
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