Title: [222070] trunk
- Revision
- 222070
- Author
- [email protected]
- Date
- 2017-09-14 18:42:52 -0700 (Thu, 14 Sep 2017)
Log Message
.:
[WinCairo] Add an option to build WebKitLegacy or WebKit
https://bugs.webkit.org/show_bug.cgi?id=176891
Added an option to build WebKitLegacy or WebKit.
Patch by Yousuke Kimoto <[email protected]> on 2017-09-14
Reviewed by Alex Christensen.
* Source/cmake/OptionsWin.cmake:
Tools:
[WinCairo] Add an option to build WebKitLegacy and WebKit
https://bugs.webkit.org/show_bug.cgi?id=176891
Since TestWebKitAPI and MiniBrowser/win are used for WebKitLegacy,
those subdirectories are ignored for WebKit build.
Patch by Yousuke Kimoto <[email protected]> on 2017-09-14
Reviewed by Alex Christensen.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (222069 => 222070)
--- trunk/ChangeLog 2017-09-15 00:30:52 UTC (rev 222069)
+++ trunk/ChangeLog 2017-09-15 01:42:52 UTC (rev 222070)
@@ -1,3 +1,14 @@
+2017-09-14 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Add an option to build WebKitLegacy or WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=176891
+
+ Added an option to build WebKitLegacy or WebKit.
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsWin.cmake:
+
2017-09-13 Don Olmstead <[email protected]>
[CMake] Detect harfbuzz without pkgconfig
Modified: trunk/Source/cmake/OptionsWin.cmake (222069 => 222070)
--- trunk/Source/cmake/OptionsWin.cmake 2017-09-15 00:30:52 UTC (rev 222069)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-09-15 01:42:52 UTC (rev 222070)
@@ -7,8 +7,10 @@
add_definitions(-DNOMINMAX)
add_definitions(-DUNICODE -D_UNICODE)
-set(ENABLE_WEBKIT_LEGACY ON)
-set(ENABLE_WEBKIT OFF)
+if ((NOT DEFINED ENABLE_WEBKIT_LEGACY) OR ENABLE_WEBKIT_LEGACY)
+ set(ENABLE_WEBKIT_LEGACY ON)
+ set(ENABLE_WEBKIT OFF)
+endif ()
WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
Modified: trunk/Tools/CMakeLists.txt (222069 => 222070)
--- trunk/Tools/CMakeLists.txt 2017-09-15 00:30:52 UTC (rev 222069)
+++ trunk/Tools/CMakeLists.txt 2017-09-15 01:42:52 UTC (rev 222070)
@@ -33,9 +33,11 @@
endif ()
elseif ("${PORT}" STREQUAL "Win")
add_subdirectory(DumpRenderTree)
- add_subdirectory(TestWebKitAPI)
- add_subdirectory(MiniBrowser/win)
add_subdirectory(ImageDiff)
+ if (ENABLE_WEBKIT_LEGACY)
+ add_subdirectory(TestWebKitAPI)
+ add_subdirectory(MiniBrowser/win)
+ endif ()
endif ()
if (ENABLE_WEBKIT AND ENABLE_API_TESTS)
Modified: trunk/Tools/ChangeLog (222069 => 222070)
--- trunk/Tools/ChangeLog 2017-09-15 00:30:52 UTC (rev 222069)
+++ trunk/Tools/ChangeLog 2017-09-15 01:42:52 UTC (rev 222070)
@@ -1,3 +1,15 @@
+2017-09-14 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Add an option to build WebKitLegacy and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=176891
+
+ Since TestWebKitAPI and MiniBrowser/win are used for WebKitLegacy,
+ those subdirectories are ignored for WebKit build.
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2017-09-14 Lucas Forschler <[email protected]>
Create a launcher for webkit-archives
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
