Commit graph

31 commits

Author SHA1 Message Date
Dale Glass
f7af9a8b2a Fix build - missing variable 2021-06-20 14:22:28 +02:00
Dale Glass
1b999acb2f Add more explanatory comments 2021-06-20 14:22:28 +02:00
Dale Glass
506fd9563a Handle empty environment variables as false 2021-06-20 14:22:28 +02:00
Dale Glass
2a8278f522 Temp changes 2021-06-20 14:22:28 +02:00
Dale Glass
50dfa73244 Concatenate Windows paths correctly 2021-06-20 14:22:28 +02:00
Dale Glass
ca489bd420 Simplify system Qt path 2021-06-20 14:22:28 +02:00
Dale Glass
474cd6b1c7 Improve Qt handling in CMake
Support 3 options:

	* VIRCADIA_USE_SYSTEM_QT is set -- use system's Qt
	* VIRCADIA_QT_PATH is set -- use Qt found in that dir
	* Otherwise -- use downloaded Qt package

This removes these variables:
	* VIRCADIA_USE_QT_VERSION
	* VIRCADIA_USE_PREBUILT_QT
	* HIFI_QT_BASE
2021-06-20 14:22:28 +02:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Julian Groß
69a3f21e5d Initial partial linux aarch64 support 2021-04-06 03:50:36 +02:00
Julian Groß
f56161363a Merge remote-tracking branch 'refs/remotes/vircadia/feature/qt-update'
Fix merge-conflicts
2021-02-27 20:39:11 +01:00
Julian Groß
9222348863 Remove Ubuntu 16.04 package as we haven't supported it as long as I have been here.
Remove Ubuntu 19.10 package as support for it ran out last year.
2021-02-23 15:55:52 +01:00
Julian Groß
8f473084e5 Update README and change to xz compression 2021-02-21 01:53:09 +01:00
Julian Groß
cd0bf03576 Move Qt package to athena s3 2021-02-21 00:52:41 +01:00
Julian Groß
e3bab8a6b9 Update Ubuntu 18.04 amd64 Qt to 5.15.2 2021-02-21 00:22:39 +01:00
ArcadeFever
8ba0bdfb60 Update MacOSX build to QT 5.15.2 along with updated build instructions 2021-01-16 22:09:47 -08:00
David Rowe
d5530f180b Update Windows builds to Qt 5.15.2 2020-12-28 15:54:38 +13:00
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
kasenvr
ec1c8f2b87
Merge pull request #891 from JulianGro/ubuntu_20_04_cmake
Fix hifi_qt.py reporting Ubuntu 20.04 as outdated
2020-12-03 17:47:33 -05:00
Kalila L
0575971d12 Fix references 'kasen/core' -> 'master' 2020-12-01 05:58:01 -05:00
Julian Groß
dec726b976 Update hifi_qt.py to recognize ubuntu version over 19.10 as not supported yet. 2020-11-28 23:30:34 +01:00
Thijs Wenker
bbda0cc6d0 CR fixes 2020-04-27 01:17:45 +02:00
Thijs Wenker
403925ef0e add missing exceptions qt downloader 2020-04-19 22:50:52 +02:00
Thijs Wenker
b89ddf33ec fix missing url 2020-04-19 22:50:51 +02:00
David Rowe
0658315f51 Work around GitHub Actions Windows & OSX builds failing to download Qt
Credit: Dale Glass <dale@daleglass.net>
2020-04-13 10:40:34 +12:00
David Rowe
a1df2208de Fix distro module for Linux 2020-04-12 13:58:36 +12:00
David Rowe
927bb1985f Add support for Linux custom Qt builds
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:43:36 +12:00
David Rowe
d79c320096 Fix Linux Qt 2020-04-11 20:47:27 +12:00
David Rowe
3504caf662 Reinstate Ubuntu 19 support 2020-04-11 10:02:26 +12:00
David Rowe
a8b4f22fc6 Update new build URLs 2020-04-09 16:54:14 +12:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00