diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-04-22 21:42:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 01:30:20 +0200 |
| commit | 4341ae32f43e7e36a92c6e738a29de40d0667cb0 (patch) | |
| tree | 2bb12e932d989b5ed9d480f2d108028c994eaa0c | |
| parent | e145b67fbd54f147dab0f8e460280a9c8533aa7b (diff) | |
Enable OpenGL library detection for mac.
Change-Id: If99d3faf2b08ac5109d619ff69efdaa3857c007f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | src/gui/Qt5GuiConfigExtras.cmake.in | 7 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in index 03b98ed273..f385fa0f6e 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -1,6 +1,4 @@ -!!IF !mac - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) @@ -73,6 +71,9 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) PATHS \"${LibDir}\" NO_DEFAULT_PATH !!ENDIF ) +!!IF mac + set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}") +!!ENDIF if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) message(FATAL_ERROR \"Failed to find \\\"${_lib}\\\" in \\\"${LibDir}\\\", using the CMAKE_FIND_ROOT_PATH \\\"${CMAKE_FIND_ROOT_PATH}\\\".\") endif() @@ -123,5 +124,3 @@ foreach(_config ${_configs}) ) endforeach() unset(_configs) - -!!ENDIF diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index ea218f630f..04e73cc7c9 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -121,12 +121,10 @@ test_module_includes( ) expect_pass(test_concurrent_module) expect_pass(test_openglextensions_module) -if (NOT APPLE) - if (QT_WITH_ANGLE OR NOT WIN32) - expect_pass(test_egl_lib) - endif() - expect_pass(test_opengl_lib) +if (QT_WITH_ANGLE OR (NOT WIN32 AND NOT APPLE)) + expect_pass(test_egl_lib) endif() +expect_pass(test_opengl_lib) if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) expect_pass(test_interface) |