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
4de9da8b
Commit
4de9da8b
authored
Feb 19, 2015
by
Fabio Bas
Browse files
Attempt to get travis compile using qt5.2
parent
56918079
Changes
2
Show whitespace changes
Inline
Side-by-side
travis-compile.sh
View file @
4de9da8b
...
...
@@ -8,5 +8,8 @@ prefix=""
if
[[
$TRAVIS_OS_NAME
==
"osx"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
fi
if
[[
$TRAVIS_OS_NAME
==
"linux"
&&
$QT4
==
0
]]
;
then
prefix
=
"-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
fi
cmake ..
-DWITH_SERVER
=
1
-DWITH_QT4
=
$QT4
$prefix
make
-j2
travis-dependencies.sh
View file @
4de9da8b
...
...
@@ -12,10 +12,9 @@ else
sudo
apt-get update
-qq
sudo
apt-get
install
-y
qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
else
sudo
add-apt-repository
--yes
ppa:
ubuntu-sdk-team/ppa
sudo
add-apt-repository
--yes
ppa:
beineri/opt-qt521
sudo
apt-get update
-qq
sudo
apt-get
install
-y
libprotobuf-dev protobuf-compiler qtbase5-dev cmake
\
qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools
\
qttools5-dev qtmultimedia5-dev libqt5svg5-dev
sudo
apt-get
install
-y
libprotobuf-dev protobuf-compiler cmake libsqlite3-dev
\
qt52base qt52webkit qt52tools qt52svg
fi
fi
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