Mercurial > vanilla
annotate www/webkitgtk/patch-isystem.patch @ 743:a6ccd21107cb
www/webkit: initial import, closes #1752
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 07 Aug 2019 07:13:31 +0200 |
parents | |
children |
rev | line source |
---|---|
743
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 --- ./Tools/MiniBrowser/gtk/CMakeLists.txt.orig 2019-08-05 09:37:14.540345025 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 +++ ./Tools/MiniBrowser/gtk/CMakeLists.txt 2019-08-05 09:37:25.348345357 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 @@ -59,7 +59,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
4 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 add_executable(MiniBrowser ${MiniBrowser_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 --- ./Tools/TestWebKitAPI/glib/CMakeLists.txt.orig 2019-08-05 09:37:35.632345673 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 +++ ./Tools/TestWebKitAPI/glib/CMakeLists.txt 2019-08-05 09:37:49.932346112 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 @@ -95,7 +95,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 include_directories(${WebKitGLibAPITests_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 -include_directories(SYSTEM ${WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 +include_directories(${WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 add_library(WebKitGLibAPITestsCore STATIC ${WebKitGLibAPITests_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 target_link_libraries(WebKitGLibAPITestsCore WebKit) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 @@ -161,7 +161,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 target_compile_definitions(${test_name} PUBLIC QT_NO_KEYWORDS=1) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 target_link_libraries(${test_name} ${WPEQtAPITest_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 - target_include_directories(${test_name} SYSTEM PRIVATE ${WPEQtAPITests_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 + target_include_directories(${test_name} PRIVATE ${WPEQtAPITests_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 target_include_directories(${test_name} PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
30 ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/qt) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 endmacro() |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 --- ./Tools/TestWebKitAPI/PlatformJSCOnly.cmake.orig 2019-08-05 09:30:13.544332093 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 +++ ./Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2019-08-05 09:30:20.548332308 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
34 @@ -6,7 +6,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
37 if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
38 - include_directories(SYSTEM |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
39 + include_directories( |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
40 ${GLIB_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
41 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
42 list(APPEND TestWTF_SOURCES |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 --- ./Tools/TestWebKitAPI/PlatformGTK.cmake.orig 2019-08-05 09:29:47.984331308 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
44 +++ ./Tools/TestWebKitAPI/PlatformGTK.cmake 2019-08-05 09:29:57.020331585 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 @@ -22,7 +22,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 ${WEBKIT_DIR}/UIProcess/API/gtk |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
49 -include_directories(SYSTEM |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
50 +include_directories( |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
51 ${GDK3_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
52 ${GLIB_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
53 ${GSTREAMER_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
54 --- ./Source/WebDriver/CMakeLists.txt.orig 2019-08-05 09:37:59.296346400 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
55 +++ ./Source/WebDriver/CMakeLists.txt 2019-08-05 09:38:05.940346604 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
56 @@ -42,7 +42,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
57 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
58 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
59 include_directories(${WebDriver_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
60 -include_directories(SYSTEM ${WebDriver_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
61 +include_directories(${WebDriver_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
62 add_executable(WebDriver ${WebDriver_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
63 target_link_libraries(WebDriver ${WebDriver_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
64 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
65 --- ./Source/WebKit/PlatformGTK.cmake.orig 2019-08-05 09:33:16.360337709 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
66 +++ ./Source/WebKit/PlatformGTK.cmake 2019-08-05 09:33:41.168338471 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
67 @@ -665,7 +665,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
68 target_include_directories(WebKitPluginProcess2 PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
69 ${WebKitCommonIncludeDirectories} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
70 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
71 - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
72 + target_include_directories(WebKitPluginProcess2 PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
73 ${WebKitCommonSystemIncludeDirectories} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
74 ${GTK2_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
75 ${GDK2_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
76 @@ -705,7 +705,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
77 "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}" |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
78 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
79 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
80 -target_include_directories(webkit2gtkinjectedbundle SYSTEM PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
81 +target_include_directories(webkit2gtkinjectedbundle PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
82 ${WebKit_SYSTEM_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
83 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
84 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
85 --- ./Source/cmake/WebKitMacros.cmake.orig 2019-08-05 09:35:29.196341789 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
86 +++ ./Source/cmake/WebKitMacros.cmake 2019-08-05 09:35:38.300342069 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
87 @@ -152,7 +152,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
88 ${${_target}_SOURCES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
89 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
90 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
91 - target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
92 + target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
93 target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
94 target_link_libraries(${_target} ${${_target}_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
95 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
96 --- ./Source/cmake/WebKitCompilerFlags.cmake.orig 2019-08-05 09:34:01.300339089 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
97 +++ ./Source/cmake/WebKitCompilerFlags.cmake 2019-08-05 09:35:19.180341481 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
98 @@ -216,31 +216,6 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
99 set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
100 set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS}") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
101 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
102 - |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
103 -# Ensure that the default include system directories are added to the list of CMake implicit includes. |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
104 -# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem). |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
105 -# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
106 -macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
107 - file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
108 - separate_arguments(_buildFlags UNIX_COMMAND "${_flags}") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
109 - execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
110 - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
111 - ERROR_VARIABLE _gccOutput) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
112 - file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
113 - if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
114 - set(${_result} ${CMAKE_MATCH_1}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
115 - string(REPLACE "\n" " " ${_result} "${${_result}}") |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
116 - separate_arguments(${_result}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
117 - endif () |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
118 -endmacro() |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
119 - |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
120 -if (COMPILER_IS_GCC_OR_CLANG) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
121 - DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
122 - set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
123 - DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
124 - set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
125 -endif () |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
126 - |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
127 if (COMPILER_IS_GCC_OR_CLANG) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
128 set(ATOMIC_TEST_SOURCE " |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
129 #include <atomic> |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
130 --- ./Source/JavaScriptCore/CMakeLists.txt.orig 2019-08-05 09:39:00.468348279 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
131 +++ ./Source/JavaScriptCore/CMakeLists.txt 2019-08-05 09:39:08.728348533 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
132 @@ -1283,13 +1283,13 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
133 ${JavaScriptCore_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
134 ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
135 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
136 -target_include_directories(LLIntSettingsExtractor SYSTEM PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
137 +target_include_directories(LLIntSettingsExtractor PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
138 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
139 target_include_directories(LLIntOffsetsExtractor PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
140 ${JavaScriptCore_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
141 ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
142 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
143 -target_include_directories(LLIntOffsetsExtractor SYSTEM PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
144 +target_include_directories(LLIntOffsetsExtractor PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
145 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
146 add_subdirectory(shell) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
147 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
148 --- ./Source/JavaScriptCore/shell/CMakeLists.txt.orig 2019-08-05 09:38:28.744347304 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
149 +++ ./Source/JavaScriptCore/shell/CMakeLists.txt 2019-08-05 09:38:34.484347481 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
150 @@ -36,7 +36,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
151 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
152 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
153 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
154 -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
155 +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
156 add_executable(jsc ${JSC_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
157 target_link_libraries(jsc ${JSC_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
158 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
159 --- ./Source/WebCore/CMakeLists.txt.orig 2019-08-05 09:39:20.148348883 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
160 +++ ./Source/WebCore/CMakeLists.txt 2019-08-05 09:39:43.724349608 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
161 @@ -2104,7 +2104,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
162 # paths of WebCore. |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
163 add_library(WebCoreHeaderInterface INTERFACE) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
164 target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
165 -target_include_directories(WebCoreHeaderInterface SYSTEM INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
166 +target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
167 target_link_libraries(WebCoreHeaderInterface INTERFACE ${WebCore_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
168 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
169 if (MSVC) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
170 @@ -2114,7 +2114,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
171 add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
172 add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
173 target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
174 -target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
175 +target_include_directories(WebCoreTestSupport PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
176 target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES}) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
177 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
178 if (WebCoreTestSupport_OUTPUT_NAME) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
179 --- ./Source/WebCore/PlatformGTK.cmake.orig 2019-08-05 09:35:55.792342606 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
180 +++ ./Source/WebCore/PlatformGTK.cmake 2019-08-05 09:36:19.120343323 +0200 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
181 @@ -164,7 +164,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
182 target_include_directories(WebCorePlatformGTK2 PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
183 ${WebCore_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
184 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
185 - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
186 + target_include_directories(WebCorePlatformGTK2 PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
187 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
188 ${GTK2_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
189 ${GDK2_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
190 @@ -190,7 +190,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
191 target_include_directories(WebCorePlatformGTK PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
192 ${WebCore_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
193 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
194 -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
195 +target_include_directories(WebCorePlatformGTK PRIVATE |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
196 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
197 ${GTK_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
198 ${GDK_INCLUDE_DIRS} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
199 @@ -206,7 +206,7 @@ |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
200 "${WEBCORE_DIR}/bindings/gobject/" |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
201 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
202 |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
203 -include_directories(SYSTEM |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
204 +include_directories( |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
205 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
206 ) |
a6ccd21107cb
www/webkit: initial import, closes #1752
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
207 |