Commit graph

71 commits

Author SHA1 Message Date
d214d8fc66 Update VCPKG on Windows, so it can find newer versions of Visual Studio. 2024-07-07 12:29:46 +02:00
Dale Glass
e6ed4f4ebc Fix prebuild.py code ordering to make --get-vcpkg-id and --get-vcpkg-path correctly in the repo root 2024-02-26 20:07:00 +01:00
63e14e0644
Merge pull request #812 from overte-org/linux-server-gha-update
Linux server gha update
2024-02-16 23:49:06 +01:00
Dale Glass
2d2e07b693 Review fixes 2024-02-13 00:28:07 +01:00
Dale Glass
0e2131e80c Add a way to get VCPKG path and hash ID 2024-02-12 18:24:35 +01:00
8cc8be12b6 Downgrade to VCPKG version 2023.11.20 because of upstream regression https://github.com/microsoft/vcpkg/issues/36094 2024-02-12 17:01:37 +01:00
0ad3464e45 Update VCPKG for Linux aarch64 2024-02-03 19:04:04 +01:00
Dale Glass
adf86d282f Fix package, was missing .vcpkg-root 2023-12-04 22:20:55 +01:00
Dale Glass
09e0413faf Update Linux vcpkg to the same as the Windows version 2023-12-04 22:02:13 +01:00
2aab5ba519 Update VCPKG on Windows to version 2023.10.19 2023-11-19 21:28:48 +01:00
9b6d202a21 Rebranding and fixing URLs 2022-09-08 22:10:13 +02:00
1da5fe2209 Update VCPKG 2022-08-15 22:18:15 +02:00
Julian Groß
8041f27713 Allow installing VCPKG inside working directory for GHA builds 2021-09-16 06:22:03 +02:00
Julian Groß
f4f4137aa8 Fix VCPKG package for aarch64 linux 2021-09-16 06:20:48 +02:00
Dale Glass
efd15dc43a Make hifi_vcpkg.py use ~/vircadia-files too
Makes it consistent with the change made for Qt
2021-06-20 14:22:28 +02:00
Julian Groß
69a3f21e5d Initial partial linux aarch64 support 2021-04-06 03:50:36 +02:00
David Rowe
367e8c1f87 Updated Windows VCPKG that includes an alternative JOM download URL 2021-01-23 09:10:58 +13:00
Thijs Wenker
b9d4791af2
fix CR style error 2020-05-08 00:55:43 +02:00
Thijs Wenker
bbda0cc6d0 CR fixes 2020-04-27 01:17:45 +02:00
Thijs Wenker
ba7f740625 try fix osx vcpkg build 2020-04-19 22:50:50 +02:00
Thijs Wenker
0c8359816c - make vcpkg output smaller by removing downloads and packages folders
- only build the full version of the clients for now (server+client)
- disable using a predefined vcpkg for CI builds for now.
-
2020-04-19 22:50:50 +02:00
Thijs Wenker
48ee437c00 cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release 2020-04-19 22:50:49 +02:00
David Rowe
88ee66abad Further work-arounds for "?" in URLs 2020-04-13 11:02:50 +12:00
David Rowe
3504caf662 Reinstate Ubuntu 19 support 2020-04-11 10:02:26 +12:00
David Rowe
1a4bb41f22 Fix up quazip configuration 2020-04-10 09:34:00 +12:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
Dale Glass
47043766f3 Remove usage of deprecated platform.linux_distribution()
Also, make error reporting slightly friendlier, and add experimental
support for Ubuntu 19.10.
2020-01-12 21:11:07 +01:00
Tara
05f54bc8c7
Fix generating cmake
vcpkg throws an error when running cmake about a public key error. This resolves the possibility of the error showing up.
2020-01-04 20:00:32 -07:00
Dale Glass
ac5a70fca0 Change asset URLs to Athena S3 bucket.
This uses a variable that can be overriden with an environment variable.
This makes it easy for the community to create alternate asset hosts.

Due to vcpkg using a clean environment, variables can't be easily passed
to cmake scripts run by vcpkg. This was worked around by writing the data
that needs to be passed into temporary files and reading it from the
vcpkg ports.
2019-12-18 17:36:01 +01:00
Brad Davis
f39088fb0b Github Actions master builds 2019-12-03 10:56:04 -08:00
Brad Davis
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Anthony J. Thibault
7371c8e83d Fix for github action build 2019-11-22 15:30:13 -08:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00
danteruiz
c64b716a07 fix hifi_vcpkg.py script crash 2019-10-28 14:21:19 -07:00
Bradley Austin Davis
5bf2365a5e Update Qt URL and force vcpkg hash change 2019-10-22 08:25:13 -07:00
Seth Alves
0a01c3ceab boostrapping, not even once. 2019-10-13 17:36:32 -07:00
Brad Hefta-Gaub
54dae34abe
Revert "BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable" 2019-09-24 11:26:50 -07:00
danteruiz
da655c837e Do not download Qt if Qt_CMAKE_PREFIX_PATH as an environment variable 2019-09-19 22:35:59 -07:00
Brad Davis
ee3b91f465 Fix vcpkg pre-requisites build for devs using VS2019 2019-08-05 20:02:58 -07:00
Clement
c7442e3a62 Remove QT_CMAKE_PREFIX_PATH prod hack 2019-07-02 16:00:55 -07:00
Anthony J. Thibault
154fd393ba Bug fix for crash in QScriptEngine::reportAdditionalMemoryCost()
This fix requires a patch to qt.  This build includs a new pre-built Qt 5.12.3 with the patch applied.
See tools/qt5-builder/qtscript-crash-fix.patch to see actual patch applied.

* Touched bullet3 portfile to create new vckpg hash
* New urls for qt assets which include qscript patch hifi_vcpkg.py
* Updated tools/qt5-builder/ with qscript patch and README.md directions.

https://highfidelity.atlassian.net/browse/BUGZ-46

A qt bug was filed to hopefully get this bug fixed upstream.
https://bugreports.qt.io/browse/QTBUG-76176
2019-06-03 17:11:54 -07:00
Anthony Thibault
5c982855ab Added cmake messages to help debug config issues
Also remove uncessary HIFI_QT_INSTALL_ROOT env varaible from hifi_vcpkg.py
2019-05-30 09:22:53 -07:00
Anthony J. Thibault
ddf1543d68 Update mac qt build
* Reformat whitespace in README.md
* hifi_vckpg.py: Remove macos var/temp hack for vcpkg
* hifi_vckpg.py: Add ability to override HIFI_QT_INSTALL_ROOT dir with environment variable.
* hifi_vckpg.py: Update macos url for pre-built qt 5.12.3 on S3.
* cmake/ports/bullet3/portfile.cmake: add comment to force change in vcpkg hash.
* tools/qt-builder/README.md: updated formatting and added details about how to generate symbols for macos and pc
* tools/qt-builder: added prepare python scripts for symbols
* cmake/macros/SetupQt.cmake: Remove hardcoded var/temp qt cmake path
2019-05-29 17:11:24 -07:00
Anthony J. Thibault
a394145239 Merge branch 'master' into feature/qt-5.12.3-windows-symbols 2019-05-23 15:45:49 -07:00
Anthony J. Thibault
a7874fa556 Update windows build with symbols for release qt-5.12.3
hifi_vcpkg.py will now download a new version of qt that contains release symbols.
made minor changes to bullet3/portfile.cmake to trigger a new vkpkg hash.
2019-05-23 14:10:06 -07:00
Seth Alves
886772eb39 only worry about Ubuntu major versions when selecting Qt package 2019-05-22 11:27:14 -07:00
Andrew Meadows
528a64c618 hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds 2019-05-18 06:45:25 -07:00
Andrew Meadows
595edb9f6e more correct QT_VERSION detection 2019-05-16 12:29:37 -07:00
Andrew Meadows
0be4feff2c remove sha512sum checks for now 2019-05-15 14:38:42 -07:00
Andrew Meadows
5a27f15821 new qt5 assets in a more correct aws bucket 2019-05-15 09:33:43 -07:00