Anthony Thibault
736d002f59
Apparently APPLE is UNIX in cmake.
2019-05-30 09:44:27 -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
Andrew Meadows
670effd372
handle case when QT_CMAKE_PREFIX_PATH not defined on UNIX
2019-05-21 03:52:01 -07:00
Andrew Meadows
8dcc617acc
obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX
2019-05-20 20:20:20 -07:00
Andrew Meadows
528a64c618
hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds
2019-05-18 06:45:25 -07:00
Andrew Meadows
9e8d604373
remove debug logs
2019-05-16 16:35:16 -07:00
Andrew Meadows
3e63734123
more correct QT_VERSION detection for MacOS
2019-05-16 13:50:23 -07:00
Andrew Meadows
595edb9f6e
more correct QT_VERSION detection
2019-05-16 12:29:37 -07:00
Andrew Meadows
4cf9673dbb
Merge master into 22007-hifiQtBuildv2
2019-05-15 14:10:30 -07:00
Roxanne Skelly
72fe3a66f5
Debugging code to monitor the queue depth for a few critical threads
2019-05-13 15:56:55 -07:00
NissimHadar
c0201ac2ba
Corrected cmake macros.
2019-05-04 18:45:51 -07:00
NissimHadar
844fbec36f
So that both Jenkins and local Mac are happy.
2019-05-04 18:09:54 -07:00
NissimHadar
50d1958c4c
Reverted unneeded changes.
2019-05-04 17:30:49 -07:00
NissimHadar
604f506dec
Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2
2019-05-03 19:24:45 -07:00
NissimHadar
88a89de7c6
Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2
2019-05-03 19:18:34 -07:00
NissimHadar
c12d270f8a
Use macdeployqt in post build
2019-04-29 14:33:17 -07:00
NissimHadar
f2678ddb73
Corrected both installers.
2019-04-29 12:57:08 -07:00
NissimHadar
d1a29daf36
Corrected both installers.
2019-04-29 12:56:49 -07:00
NissimHadar
53c5e966db
Debugging when to use macdeployqt.
2019-04-29 12:47:39 -07:00
NissimHadar
7eaa45f5c1
Added macdeployqt to local builds.
2019-04-29 12:33:23 -07:00
NissimHadar
5aff0bf3e9
Make sure vcpkg'ed version of windeployqt.exe is used.
2019-04-25 15:07:34 -07:00
Clement
e1e7556226
Fix cmake warnings
2019-04-25 13:53:44 -07:00
NissimHadar
9b22614135
Removed test code.
2019-04-25 10:16:15 -07:00
NissimHadar
90d7948e0d
TEST
2019-04-25 09:01:10 -07:00
NissimHadar
bf1d73b413
Undid testing.
2019-04-25 08:29:53 -07:00
NissimHadar
db77fda626
testing.
2019-04-25 07:46:23 -07:00
NissimHadar
91eacf7d3c
Added message to know Qt path.
2019-04-24 18:02:39 -07:00
NissimHadar
ba9733aa03
Removed test code.
2019-04-24 17:40:08 -07:00
NissimHadar
bd40ea057b
Testing windeployqt
2019-04-24 14:42:18 -07:00
NissimHadar
f4b1aedbae
Minor cleanup.
2019-04-23 15:06:40 -07:00
NissimHadar
c9d128ae71
testing
2019-04-23 10:39:52 -07:00
NissimHadar
2963dd8fa5
testing
2019-04-23 08:18:41 -07:00
NissimHadar
e7b780fcb9
testing
2019-04-23 08:11:09 -07:00
NissimHadar
182799b4ec
testing
2019-04-23 08:07:25 -07:00
NissimHadar
55e1841358
testing
2019-04-23 07:58:33 -07:00
NissimHadar
01a838b5cb
Updated for Jenkins.
2019-04-22 21:36:35 -07:00
NissimHadar
d7197dba65
Use QT_CMAKE_PREFIX_PATH only on local builds.
2019-04-22 20:56:32 -07:00
NissimHadar
24110ebf86
Ready for Mac/Linux testing.
2019-04-22 17:58:20 -07:00
NissimHadar
75e1437274
Use optional environment variable for timestamp server URL
2019-04-05 14:55:23 -07:00
Shannon Romano
65a039e228
Merge pull request #15312 from roxanneskelly/Case19858
...
Case 19858 - crashpad_handler is duplicated outside of the Interface/…
2019-04-04 11:27:20 -07:00
Roxanne Skelly
80683a7b7a
Crashpad fix 2nd try
2019-04-02 17:35:09 -07:00
Roxanne Skelly
b841125b19
Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS
2019-04-02 16:42:09 -07:00
Olivier Prat
e2bc80b46f
Fixed for debug
2019-04-01 15:07:29 +02:00
Olivier Prat
4e39a063f7
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2019-04-01 11:08:41 +02:00
Olivier Prat
c480f36dd4
Finally managed to switch to all static for OpenEXR
2019-03-28 10:58:58 +01:00
Olivier Prat
eb0e1d5f93
Fix for Mac and Ubuntu
2019-03-27 18:34:59 +01:00
Olivier Prat
610d8347ff
Removed FindOpenEXR.cmake alltogether
2019-03-27 18:00:49 +01:00
Olivier Prat
89fbe131c2
Yet another try at fixing compilation
2019-03-27 13:56:11 +01:00
Olivier Prat
7791401b0e
Trying to fix Ubuntu & Mac builds.
2019-03-27 11:17:22 +01:00