diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 19:43:21 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 17:08:48 +0000 |
| commit | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (patch) | |
| tree | fd8632d48c2ee72747feaa0e2b458d591e254288 /Source/cmake/OptionsQt.cmake | |
| parent | 8cab1238d6ea14fa6a61ed4e0c5d39ccd0736ec2 (diff) | |
Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41
Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/cmake/OptionsQt.cmake')
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index cbdaa192b..9ca197f72 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -183,6 +183,13 @@ if (QT_CORE_TYPE MATCHES STATIC) set(MACOS_BUILD_FRAMEWORKS OFF) endif () +# static icu libraries on windows are build with 's' prefix +if (QT_STATIC_BUILD AND MSVC) + set(ICU_LIBRARY_PREFIX "s") +else () + set(ICU_LIBRARY_PREFIX "") +endif () + if (QT_STATIC_BUILD) set(ENABLE_WEBKIT2_DEFAULT OFF) else () @@ -662,10 +669,19 @@ if (ENABLE_OPENGL) SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE) SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE) - # TODO: Add proper support of DynamicGL detection to Qt and use it - if (WIN32 AND NOT QT_USES_GLES2_ONLY) - set(Qt5Gui_OPENGL_IMPLEMENTATION GL) + if (WIN32) + include(CheckCXXSymbolExists) + set(CMAKE_REQUIRED_INCLUDES ${Qt5Gui_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_FLAGS ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}) + check_cxx_symbol_exists(QT_OPENGL_DYNAMIC qopenglcontext.h HAVE_QT_OPENGL_DYNAMIC) + if (HAVE_QT_OPENGL_DYNAMIC) + set(Qt5Gui_OPENGL_IMPLEMENTATION DynamicGL) + endif () + unset(CMAKE_REQUIRED_INCLUDES) + unset(CMAKE_REQUIRED_FLAGS) endif () + + message("Qt OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}") endif () if (NOT ENABLE_VIDEO) @@ -857,7 +873,7 @@ if (MSVC) endif () if (NOT QT_CONAN_DIR) - set(ICU_LIBRARIES icuuc${CMAKE_DEBUG_POSTFIX} icuin${CMAKE_DEBUG_POSTFIX} icudt${CMAKE_DEBUG_POSTFIX}) + set(ICU_LIBRARIES ${ICU_LIBRARY_PREFIX}icuuc${CMAKE_DEBUG_POSTFIX} ${ICU_LIBRARY_PREFIX}icuin${CMAKE_DEBUG_POSTFIX} ${ICU_LIBRARY_PREFIX}icudt${CMAKE_DEBUG_POSTFIX}) endif () endif () |