diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-26 19:01:31 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-29 12:23:00 +0200 |
| commit | 2ed63e587eefb246dba9e69aa01fdb2abb2def13 (patch) | |
| tree | c2d8ab3f0ba66a9544f434787e8350129099f8cf | |
| parent | 7fcc9cf05500fd3a0a1ba5c2f90a8ad3bcd8e5b0 (diff) | |
CMake: WrapOpenGL target should also link AGL on macOS
This is consistent with the qmake mkspec in common/mac.conf
Task-number: QTBUG-85240
Task-number: QTBUG-84781
Change-Id: I99df365a3be541356482d29eda806020f4e298d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | cmake/FindWrapOpenGL.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmake/FindWrapOpenGL.cmake b/cmake/FindWrapOpenGL.cmake index fc6ddf70469..fa2acc746bf 100644 --- a/cmake/FindWrapOpenGL.cmake +++ b/cmake/FindWrapOpenGL.cmake @@ -30,7 +30,16 @@ if (OpenGL_FOUND) set(__opengl_fw_path "-framework" "OpenGL") endif() + find_library(WrapOpenGL_AGL NAMES AGL) + if(WrapOpenGL_AGL) + set(__opengl_agl_fw_path "${WrapOpenGL_AGL}") + endif() + if(NOT __opengl_agl_fw_path) + set(__opengl_agl_fw_path "-framework" "AGL") + endif() + target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path}) + target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path}) else() target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL) endif() |