AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable OpenGL library detection for mac.

Browse Source 
Change-Id: If99d3faf2b08ac5109d619ff69efdaa3857c007f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2013-04-22 21:42:52 +02:00 committed by The Qt Project
parent e145b67fbd
commit 4341ae32f4
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/Qt5GuiConfigExtras.cmake.in
View File

@ -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

4
tests/auto/cmake/CMakeLists.txt
View File

@ -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)
if (QT_WITH_ANGLE OR (NOT WIN32 AND NOT APPLE))
expect_pass(test_egl_lib)
endif()
expect_pass(test_opengl_lib)
endif()
if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
expect_pass(test_interface)