diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2020-03-18 08:12:28 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-03-18 14:33:30 +0300 |
commit | fea39028c57c256e89aa923f4006f2b002d8e3f9 (patch) | |
tree | 0b3257b41540f593dc539b8bac9968afe74c1f91 | |
parent | 13742248026560cd1155228d5e8390d21667f111 (diff) |
Import QtWebKit commit 7cbe5431c38860f20419db9df9b673e822f297c0
Change-Id: I1045ef79f6a6afd08cd85abc668be56a5f20cb69
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r-- | Source/WebCore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Source/cmake/OptionsQt.cmake | 19 | ||||
-rw-r--r-- | Source/cmake/WebKitMacros.cmake | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 3b3a9ed4b..48f779e1e 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -3366,6 +3366,7 @@ endif () set(WebCoreTestSupport_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/platform/mock" "${WEBCORE_DIR}/testing" + "${WEBCORE_DIR}/testing/js" "${DERIVED_SOURCES_WEBCORE_DIR}" ) diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 1ee60b777..fb1112f41 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -3,7 +3,7 @@ include(FeatureSummary) include(ECMEnableSanitizers) include(ECMPackageConfigHelpers) -set(ECM_MODULE_DIR ${CMAKE_MODULE_PATH}) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR}) set(PROJECT_VERSION_MAJOR 5) set(PROJECT_VERSION_MINOR 212) @@ -290,6 +290,7 @@ option(GENERATE_DOCUMENTATION "Generate HTML and QCH documentation" OFF) cmake_dependent_option(ENABLE_TEST_SUPPORT "Build tools for running layout tests and related library code" ON "DEVELOPER_MODE" OFF) option(USE_STATIC_RUNTIME "Use static runtime (MSVC only)" OFF) +option(ENABLE_PCH "Use pre-compiled headers (MSVC only)" ON) # Private options specific to the Qt port. Changing these options is # completely unsupported. They are intended for use only by WebKit developers. @@ -732,6 +733,14 @@ if (FORCE_DEBUG_INFO) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index") endif () + + if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) + # Create pdb files for debugging purposes, also for Release builds + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") + endif () endif () if (APPLE) @@ -896,14 +905,6 @@ if (MSVC) /wd6246 /wd6255 /wd6387 ) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - # Create pdb files for debugging purposes, also for Release builds - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") - endif () - add_compile_options(/GS) # We do not use exceptions diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake index c90d223e8..9f9e67706 100644 --- a/Source/cmake/WebKitMacros.cmake +++ b/Source/cmake/WebKitMacros.cmake @@ -24,7 +24,7 @@ macro(ADD_SOURCE_DEPENDENCIES _source _deps) endmacro() macro(ADD_PRECOMPILED_HEADER _header _cpp _source) - if (MSVC) + if (MSVC AND (ENABLE_PCH OR NOT PORT STREQUAL "Qt")) get_filename_component(PrecompiledBasename ${_header} NAME_WE) set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${PrecompiledBasename}.pch") set(_sources ${${_source}}) @@ -41,6 +41,10 @@ macro(ADD_PRECOMPILED_HEADER _header _cpp _source) list(APPEND ${_source} ${_cpp}) endif () + if (MSVC AND NOT ENABLE_PCH AND PORT STREQUAL "Qt") + set(_sources ${${_source}}) + set_source_files_properties(${_sources} PROPERTIES COMPILE_FLAGS "/FI\"${_header}\"") + endif () #FIXME: Add support for Xcode. endmacro() |