Attachment 372938 Details for Bug 199108 – Patch

[patch] Patch

bug-199108-20190626213043.patch (text/plain), 4.14 KB, created by Konstantin Tokarev on 2019-06-26 11:30:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Tokarev

Created: 2019-06-26 11:30:44 PDT

Size: 4.14 KB

patch

obsolete

>Subversion Revision: 246738
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ceef29db7eea4117e0f6452944210c65c3c5f7e5..7baa5ab113cd85ac7ac264b694395e245b359f49 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-06-21  Konstantin Tokarev  <annulen@yandex.ru>
>+
>+        [cmake] Switch to built-in handling of C++ standard instead of hardcoding -std=c++17
>+        https://bugs.webkit.org/show_bug.cgi?id=199108
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rationale:
>+
>+        1. It provides an abstraction over exact flags of particular compilers -
>+           we just specify required version of C++ standard
>+        2. External libraries (like Qt used in WPEQt) may require particular C++
>+           standard or even particular C++ features to be availabe (e.g. Qt
>+           requires INTERFACE_COMPILE_FEATURES cxx_decltype, which causes cmake
>+           to add -std=gnu++11 unless proper CXX_STANDARD is defined)
>+
>+        * PlatformWPE.cmake: Use project-level default for CXX_STANDARD
>+        property.
>+
> 2019-06-24  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Fixes for compilation with unified builds disabled
>diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
>index 1a635fbf01d66e94d147698f95d5f37f94733b1e..570a41cb5d8359629d5c8817e6a7e875332a837c 100644
>--- a/Source/WebKit/PlatformWPE.cmake
>+++ b/Source/WebKit/PlatformWPE.cmake
>@@ -397,7 +397,6 @@ if (ENABLE_WPE_QT_API)
>     set_target_properties(qtwpe PROPERTIES
>         OUTPUT_NAME qtwpe
>         AUTOMOC ON
>-        CXX_STANDARD 17
>     )
>     target_compile_definitions(qtwpe PUBLIC QT_NO_KEYWORDS=1)
>     target_link_libraries(qtwpe ${qtwpe_LIBRARIES})
>diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
>index 6c48a43ceb8519b3c23dbfe8284da1ceae126c3c..9bdc36dd0279f30b9add8a81ff7ca90590b773a0 100644
>--- a/Source/cmake/OptionsCommon.cmake
>+++ b/Source/cmake/OptionsCommon.cmake
>@@ -1,3 +1,7 @@
>+set(CMAKE_CXX_STANDARD 17)
>+set(CMAKE_CXX_STANDARD_REQUIRED ON)
>+set(CMAKE_CXX_EXTENSIONS OFF)
>+
> add_definitions(-DBUILDING_WITH_CMAKE=1)
> add_definitions(-DHAVE_CONFIG_H=1)
> 
>diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
>index 1f802d42a6114e4fb3572bba6864b5f2fda1429c..c5fa4c3ea58e6c1ff125e175acbdb1d277d2ad19 100644
>--- a/Source/cmake/WebKitCompilerFlags.cmake
>+++ b/Source/cmake/WebKitCompilerFlags.cmake
>@@ -104,13 +104,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
>         WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-exceptions)
>         WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-fno-rtti)
> 
>-        check_cxx_compiler_flag("-std=c++17" CXX_COMPILER_SUPPORTS_CXX17)
>-        if (CXX_COMPILER_SUPPORTS_CXX17)
>-            WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-std=c++17)
>-        else ()
>-            message(FATAL_ERROR "Compiler with C++17 support is required")
>-        endif ()
>-
>         if (WIN32)
>             WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-mno-ms-bitfields)
>             WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-unknown-pragmas)
>diff --git a/ChangeLog b/ChangeLog
>index fcefebb7b070d43eacb8cce13a753bbced12021c..7ca9f63e34965f91cb5c7fe20257b3cfa6580998 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-06-21  Konstantin Tokarev  <annulen@yandex.ru>
>+
>+        [cmake] Switch to built-in handling of C++ standard instead of hardcoding -std=c++17
>+        https://bugs.webkit.org/show_bug.cgi?id=199108
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rationale:
>+
>+        1. It provides an abstraction over exact flags of particular compilers -
>+           we just specify required version of C++ standard
>+        2. External libraries (like Qt used in WPEQt) may require particular C++
>+           standard or even particular C++ features to be availabe (e.g. Qt
>+           requires INTERFACE_COMPILE_FEATURES cxx_decltype, which causes cmake
>+           to add -std=gnu++11 unless proper CXX_STANDARD is defined)
>+
>+        * Source/cmake/OptionsCommon.cmake:
>+        * Source/cmake/WebKitCompilerFlags.cmake:
>+
> 2019-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] Bump minimum versions of GLib, GTK, libsoup, ATK, GStreamer, and Cairo

Flags:

don.olmstead: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 199108: 372630 | 372679 | 372938 | 372956