Title: [260593] trunk
- Revision
- 260593
- Author
- [email protected]
- Date
- 2020-04-23 13:08:49 -0700 (Thu, 23 Apr 2020)
Log Message
[CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
https://bugs.webkit.org/show_bug.cgi?id=196717
Reviewed by Michael Catanzaro.
Source/WebKit:
Include CMAKE_BINARY_DIR either directly or through WebKit_PRIVATE_INCLUDE_DIRECTORIES.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
Source/WTF:
Remove public includes in WTF.
* wtf/CMakeLists.txt:
Tools:
Include CMAKE_BINARY_DIR.
* MiniBrowser/gtk/CMakeLists.txt:
* TestWebKitAPI/glib/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (260592 => 260593)
--- trunk/Source/WTF/ChangeLog 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Source/WTF/ChangeLog 2020-04-23 20:08:49 UTC (rev 260593)
@@ -1,3 +1,14 @@
+2020-04-23 Don Olmstead <[email protected]>
+
+ [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
+ https://bugs.webkit.org/show_bug.cgi?id=196717
+
+ Reviewed by Michael Catanzaro.
+
+ Remove public includes in WTF.
+
+ * wtf/CMakeLists.txt:
+
2020-04-22 Darin Adler <[email protected]>
[Cocoa] Build with UChar as char16_t even in builds that use Apple's internal SDK
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (260592 => 260593)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2020-04-23 20:08:49 UTC (rev 260593)
@@ -493,13 +493,6 @@
unicode/icu/CollatorICU.cpp
)
-set(WTF_INCLUDE_DIRECTORIES
- # FIXME: https://bugs.webkit.org/show_bug.cgi?id=196734#c1
- "${CMAKE_BINARY_DIR}"
- "${DERIVED_SOURCES_DIR}"
- "${THIRDPARTY_DIR}"
-)
-
set(WTF_PRIVATE_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
"${WTF_DERIVED_SOURCES_DIR}"
Modified: trunk/Source/WebKit/ChangeLog (260592 => 260593)
--- trunk/Source/WebKit/ChangeLog 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Source/WebKit/ChangeLog 2020-04-23 20:08:49 UTC (rev 260593)
@@ -1,3 +1,15 @@
+2020-04-23 Don Olmstead <[email protected]>
+
+ [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
+ https://bugs.webkit.org/show_bug.cgi?id=196717
+
+ Reviewed by Michael Catanzaro.
+
+ Include CMAKE_BINARY_DIR either directly or through WebKit_PRIVATE_INCLUDE_DIRECTORIES.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+
2020-04-23 Adrian Perez de Castro <[email protected]>
Regression after r260359 ([GTK][WPE] lowWatermarkPages() in MemoryPressureMonitor.cpp only searches the "low" value inside the first "Node" section)
Modified: trunk/Source/WebKit/PlatformGTK.cmake (260592 => 260593)
--- trunk/Source/WebKit/PlatformGTK.cmake 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2020-04-23 20:08:49 UTC (rev 260593)
@@ -583,6 +583,7 @@
target_include_directories(webkit2gtkinjectedbundle PRIVATE
${WebKit_INCLUDE_DIRECTORIES}
+ ${WebKit_PRIVATE_INCLUDE_DIRECTORIES}
"${DERIVED_SOURCES_DIR}/InjectedBundle"
"${FORWARDING_HEADERS_DIR}"
"${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
Modified: trunk/Source/WebKit/PlatformWPE.cmake (260592 => 260593)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-04-23 20:08:49 UTC (rev 260593)
@@ -324,7 +324,7 @@
ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle)
target_link_libraries(WPEInjectedBundle WebKit)
-target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES})
+target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES} ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-wpe.cfg
@@ -382,6 +382,7 @@
)
set(qtwpe_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
${Qt5_INCLUDE_DIRS}
${Qt5Gui_PRIVATE_INCLUDE_DIRS}
${LIBEPOXY_INCLUDE_DIRS}
Modified: trunk/Tools/ChangeLog (260592 => 260593)
--- trunk/Tools/ChangeLog 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Tools/ChangeLog 2020-04-23 20:08:49 UTC (rev 260593)
@@ -1,3 +1,15 @@
+2020-04-23 Don Olmstead <[email protected]>
+
+ [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
+ https://bugs.webkit.org/show_bug.cgi?id=196717
+
+ Reviewed by Michael Catanzaro.
+
+ Include CMAKE_BINARY_DIR.
+
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * TestWebKitAPI/glib/CMakeLists.txt:
+
2020-04-23 Ryan Haddad <[email protected]>
Unreviewed, reverting r260552.
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (260592 => 260593)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-04-23 20:08:49 UTC (rev 260593)
@@ -20,7 +20,7 @@
)
set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
- ${CMAKE_BINRARY_DIR}
+ ${CMAKE_BINARY_DIR}
${MiniBrowser_DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (260592 => 260593)
--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-04-23 20:06:25 UTC (rev 260592)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-04-23 20:08:49 UTC (rev 260593)
@@ -6,6 +6,7 @@
)
set(WebKitGLibAPITests_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
${FORWARDING_HEADERS_DIR}
${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib
${TOOLS_DIR}/TestWebKitAPI/glib/WebKitGLib
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
