Title: [216434] releases/WebKitGTK/webkit-2.16
- Revision
- 216434
- Author
- carlo...@webkit.org
- Date
- 2017-05-08 10:37:38 -0700 (Mon, 08 May 2017)
Log Message
Merge r215614 - [cmake] WTF target should not have wtf and subdirectries in public interface
https://bugs.webkit.org/show_bug.cgi?id=171115
Reviewed by Michael Catanzaro.
In r209665 WEBCORE_FRAMEWORK macro started to export INCLUDE_DIRECTORIES of
targets as their public interface, so that linked targets can use them
implicitly without copying directory lists around. This matches existing
practice for all targets except WTF, headers from which are always included
with full path starting from "<wtf/...".
Since r209665 it became possible to include headers from wtf or its
subdirectories in CMake builds without using "<wtf/..." path. It should
not be allowed.
.:
* Source/cmake/WebKitMacros.cmake: Support xxx_PRIVATE_HEADERS
CMake variables.
Source/WebCore:
* platform/graphics/texmap/coordinated/TiledBackingStore.cpp: Fix
incorrect include of WTF header.
Source/WTF:
* wtf/CMakeLists.txt: WTF/wtf and its sudirectories should not be in
public include paths of WTF target.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/ChangeLog (216433 => 216434)
--- releases/WebKitGTK/webkit-2.16/ChangeLog 2017-05-08 17:36:42 UTC (rev 216433)
+++ releases/WebKitGTK/webkit-2.16/ChangeLog 2017-05-08 17:37:38 UTC (rev 216434)
@@ -1,3 +1,23 @@
+2017-04-21 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] WTF target should not have wtf and subdirectries in public interface
+ https://bugs.webkit.org/show_bug.cgi?id=171115
+
+ Reviewed by Michael Catanzaro.
+
+ In r209665 WEBCORE_FRAMEWORK macro started to export INCLUDE_DIRECTORIES of
+ targets as their public interface, so that linked targets can use them
+ implicitly without copying directory lists around. This matches existing
+ practice for all targets except WTF, headers from which are always included
+ with full path starting from "<wtf/...".
+
+ Since r209665 it became possible to include headers from wtf or its
+ subdirectories in CMake builds without using "<wtf/..." path. It should
+ not be allowed.
+
+ * Source/cmake/WebKitMacros.cmake: Support xxx_PRIVATE_HEADERS
+ CMake variables.
+
2017-04-08 Ting-Wei Lan <lant...@gmail.com>
Elftoolchain ar doesn't support response files
Modified: releases/WebKitGTK/webkit-2.16/Source/WTF/ChangeLog (216433 => 216434)
--- releases/WebKitGTK/webkit-2.16/Source/WTF/ChangeLog 2017-05-08 17:36:42 UTC (rev 216433)
+++ releases/WebKitGTK/webkit-2.16/Source/WTF/ChangeLog 2017-05-08 17:37:38 UTC (rev 216434)
@@ -1,3 +1,23 @@
+2017-04-21 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] WTF target should not have wtf and subdirectries in public interface
+ https://bugs.webkit.org/show_bug.cgi?id=171115
+
+ Reviewed by Michael Catanzaro.
+
+ In r209665 WEBCORE_FRAMEWORK macro started to export INCLUDE_DIRECTORIES of
+ targets as their public interface, so that linked targets can use them
+ implicitly without copying directory lists around. This matches existing
+ practice for all targets except WTF, headers from which are always included
+ with full path starting from "<wtf/...".
+
+ Since r209665 it became possible to include headers from wtf or its
+ subdirectories in CMake builds without using "<wtf/..." path. It should
+ not be allowed.
+
+ * wtf/CMakeLists.txt: WTF/wtf and its sudirectories should not be in
+ public include paths of WTF target.
+
2017-04-10 Thorsten Glaser <t...@mirbsd.de>
[GTK] Fix x32 build
Modified: releases/WebKitGTK/webkit-2.16/Source/WTF/wtf/CMakeLists.txt (216433 => 216434)
--- releases/WebKitGTK/webkit-2.16/Source/WTF/wtf/CMakeLists.txt 2017-05-08 17:36:42 UTC (rev 216433)
+++ releases/WebKitGTK/webkit-2.16/Source/WTF/wtf/CMakeLists.txt 2017-05-08 17:37:38 UTC (rev 216434)
@@ -272,6 +272,12 @@
set(WTF_INCLUDE_DIRECTORIES
"${BMALLOC_DIR}"
"${WTF_DIR}"
+ "${CMAKE_BINARY_DIR}"
+ "${DERIVED_SOURCES_DIR}"
+ "${THIRDPARTY_DIR}"
+)
+
+set(WTF_PRIVATE_INCLUDE_DIRECTORIES
"${WTF_DIR}/wtf"
"${WTF_DIR}/wtf/dtoa"
"${WTF_DIR}/wtf/persistence"
@@ -279,9 +285,6 @@
"${WTF_DIR}/wtf/text/icu"
"${WTF_DIR}/wtf/threads"
"${WTF_DIR}/wtf/unicode"
- "${THIRDPARTY_DIR}"
- "${CMAKE_BINARY_DIR}"
- "${DERIVED_SOURCES_DIR}"
)
set(WTF_LIBRARIES
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (216433 => 216434)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-08 17:36:42 UTC (rev 216433)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-08 17:37:38 UTC (rev 216434)
@@ -1,3 +1,23 @@
+2017-04-21 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] WTF target should not have wtf and subdirectries in public interface
+ https://bugs.webkit.org/show_bug.cgi?id=171115
+
+ Reviewed by Michael Catanzaro.
+
+ In r209665 WEBCORE_FRAMEWORK macro started to export INCLUDE_DIRECTORIES of
+ targets as their public interface, so that linked targets can use them
+ implicitly without copying directory lists around. This matches existing
+ practice for all targets except WTF, headers from which are always included
+ with full path starting from "<wtf/...".
+
+ Since r209665 it became possible to include headers from wtf or its
+ subdirectories in CMake builds without using "<wtf/..." path. It should
+ not be allowed.
+
+ * platform/graphics/texmap/coordinated/TiledBackingStore.cpp: Fix
+ incorrect include of WTF header.
+
2017-05-05 Zalan Bujtas <za...@apple.com>
Renderers being destroyed should not be added to AX's deferred list.
Modified: releases/WebKitGTK/webkit-2.16/Source/cmake/WebKitMacros.cmake (216433 => 216434)
--- releases/WebKitGTK/webkit-2.16/Source/cmake/WebKitMacros.cmake 2017-05-08 17:36:42 UTC (rev 216433)
+++ releases/WebKitGTK/webkit-2.16/Source/cmake/WebKitMacros.cmake 2017-05-08 17:37:38 UTC (rev 216434)
@@ -283,6 +283,7 @@
${${_target}_SOURCES}
)
target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
target_link_libraries(${_target} ${${_target}_LIBRARIES})
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
