Title: [199656] trunk
- Revision
- 199656
- Author
- [email protected]
- Date
- 2016-04-18 01:09:56 -0700 (Mon, 18 Apr 2016)
Log Message
Fix incorrect assumption that APPLE implies Mac.
https://bugs.webkit.org/show_bug.cgi?id=156679
Addresses build failure introduced in r198947
Patch by Jeremy Huddleston Sequoia <[email protected]> on 2016-04-18
Reviewed by Alex Christensen.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (199655 => 199656)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-18 08:03:24 UTC (rev 199655)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-18 08:09:56 UTC (rev 199656)
@@ -868,7 +868,7 @@
set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
endif ()
-if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
+if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
add_definitions(-DENABLE_PLUGIN_PROCESS=1)
add_executable(PluginProcess ${PluginProcess_SOURCES})
add_webkit2_prefix_header(PluginProcess)
@@ -880,7 +880,7 @@
endif ()
endif ()
-if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
+if (ENABLE_DATABASE_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
add_definitions(-DENABLE_DATABASE_PROCESS=1)
add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
add_webkit2_prefix_header(DatabaseProcess)
@@ -892,7 +892,7 @@
endif ()
endif ()
-if (APPLE)
+if ("${PORT}" STREQUAL "Mac")
set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
make_directory(${_web_xpc_dir}/MacOS)
make_directory(${_web_xpc_dir}/Resources)
Modified: trunk/Source/WebKit2/ChangeLog (199655 => 199656)
--- trunk/Source/WebKit2/ChangeLog 2016-04-18 08:03:24 UTC (rev 199655)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-18 08:09:56 UTC (rev 199656)
@@ -1,3 +1,14 @@
+2016-04-18 Jeremy Huddleston Sequoia <[email protected]>
+
+ Fix incorrect assumption that APPLE implies Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=156679
+
+ Addresses build failure introduced in r198947
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2016-04-17 Yoav Weiss <[email protected]>
Initial Link preload support
Modified: trunk/Tools/CMakeLists.txt (199655 => 199656)
--- trunk/Tools/CMakeLists.txt 2016-04-18 08:03:24 UTC (rev 199655)
+++ trunk/Tools/CMakeLists.txt 2016-04-18 08:09:56 UTC (rev 199656)
@@ -27,6 +27,10 @@
if (ENABLE_MINIBROWSER)
add_subdirectory(MiniBrowser/gtk)
endif ()
+elseif ("${PORT}" STREQUAL "Mac")
+ add_subdirectory(DumpRenderTree)
+ add_subdirectory(WebKitTestRunner)
+ add_subdirectory(MiniBrowser/mac)
endif ()
if (WIN32)
@@ -35,12 +39,6 @@
add_subdirectory(MiniBrowser/win)
endif ()
-if (APPLE)
- add_subdirectory(DumpRenderTree)
- add_subdirectory(WebKitTestRunner)
- add_subdirectory(MiniBrowser/mac)
-endif ()
-
if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
add_subdirectory(TestWebKitAPI)
endif ()
Modified: trunk/Tools/ChangeLog (199655 => 199656)
--- trunk/Tools/ChangeLog 2016-04-18 08:03:24 UTC (rev 199655)
+++ trunk/Tools/ChangeLog 2016-04-18 08:09:56 UTC (rev 199656)
@@ -1,3 +1,14 @@
+2016-04-18 Jeremy Huddleston Sequoia <[email protected]>
+
+ Fix incorrect assumption that APPLE implies Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=156679
+
+ Addresses build failure introduced in r198947
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2016-04-18 Carlos Garcia Campos <[email protected]>
[GTK] Test /webkit2/WebKitWebView/mouse-target fails with overlay scrollbars
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
