diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-18 14:03:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 15:57:02 +0000 |
| commit | 5eb2c8c79eb7fe28e99aa0a5065ae65c13b69fed (patch) | |
| tree | 68d8b2dcb8ac99f98dabcb739ee3a98f75248a19 /src/gui | |
| parent | 015b53e9b4091c28b8a2d7931788c2286a245201 (diff) | |
never use pkg-config to find opengl on darwin
with homebrew, etc., this would find the opengl packaged with x11, which
is not suitable for use with cocoa.
Change-Id: I8390e1ac32c58f6644d6ef3978bdc6da9d111e79
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 6f87eb5aed..35741abc86 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -181,7 +181,7 @@ "label": "Desktop OpenGL", "test": "unix/opengldesktop", "sources": [ - { "type": "pkgConfig", "args": "gl" }, + { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" }, { "type": "makeSpec", "spec": "OPENGL" } ] }, @@ -189,7 +189,7 @@ "label": "OpenGL ES 2.0", "test": "unix/opengles2", "sources": [ - { "type": "pkgConfig", "args": "glesv2" }, + { "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" }, { "type": "makeSpec", "spec": "OPENGL_ES2" } ] }, |