diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-04 18:59:02 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-04 16:15:23 +0000 |
| commit | fdcba363c7e7e01790ba4b946e4f53f8600d8a20 (patch) | |
| tree | 735f50270fe51995a9961615ae0263fd057ca564 /Source/cmake/OptionsQt.cmake | |
| parent | b6d52c42e6595e1b283090ebb9bb21db50fed87b (diff) | |
Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597
Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/cmake/OptionsQt.cmake')
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 5c20e97d4..8f06820c5 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -58,6 +58,15 @@ set(CMAKE_MACOSX_RPATH ON) add_definitions(-DBUILDING_QT__=1) +if (WIN32) + if (${CMAKE_BUILD_TYPE} MATCHES "Debug") + set(CMAKE_DEBUG_POSTFIX d) + endif () + + set(CMAKE_SHARED_LIBRARY_PREFIX "") + set(CMAKE_SHARED_MODULE_PREFIX "") +endif () + WEBKIT_OPTION_BEGIN() if (APPLE) @@ -161,11 +170,16 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON) +if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) +endif () + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL) @@ -317,10 +331,10 @@ else () endif () if (MACOS_FORCE_SYSTEM_XML_LIBRARIES) - set(LIBXML2_INCLUDE_DIR "/usr/include/libxml2") + set(LIBXML2_INCLUDE_DIR "${CMAKE_OSX_SYSROOT}/usr/include/libxml2") set(LIBXML2_LIBRARIES xml2) if (ENABLE_XSLT) - set(LIBXSLT_INCLUDE_DIR "/usr/include/libxslt") + set(LIBXSLT_INCLUDE_DIR "${CMAKE_OSX_SYSROOT}/usr/include/libxslt") set(LIBXSLT_LIBRARIES xslt) endif () else () @@ -628,8 +642,6 @@ if (MSVC) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK") endif () - - set(CMAKE_DEBUG_POSTFIX d) elseif (${CMAKE_BUILD_TYPE} MATCHES "Release") add_compile_options(/Oy-) endif () |