diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-05-02 15:25:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-07 22:43:14 +0200 |
| commit | 3483336889444ff66f2bc5dbdee36411ccf3bdb5 (patch) | |
| tree | bd30992657e2c60ab953fbb720e88a684a230a64 /src | |
| parent | ed2df46949683d3bc798cb11bd45f2ce5025deaf (diff) | |
Only expect EGL libraries in the cmake files if Qt is configured to use it.
Change-Id: Ida382a80dba882bbeb920756adc0c16321efe37e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/gui.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index b44f563b3e..e2dd5efcde 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -56,8 +56,10 @@ contains(QT_CONFIG, angle) { CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2 } else { - CMAKE_EGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_EGL) - !isEmpty(QMAKE_LIBDIR_EGL): CMAKE_EGL_LIBDIR += $$cmakeTargetPath($$QMAKE_LIBDIR_EGL) + contains(QT_CONFIG, egl) { + CMAKE_EGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_EGL) + !isEmpty(QMAKE_LIBDIR_EGL): CMAKE_EGL_LIBDIR += $$cmakeTargetPath($$QMAKE_LIBDIR_EGL) + } contains(QT_CONFIG, opengles1) { !isEmpty(QMAKE_INCDIR_OPENGL_ES1): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES1) @@ -84,6 +86,6 @@ contains(QT_CONFIG, angle) { } } -CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL) +contains(QT_CONFIG, egl): CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL) QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist |