Title: [222489] trunk/Source/WebKitLegacy
- Revision
- 222489
- Author
- [email protected]
- Date
- 2017-09-25 21:19:22 -0700 (Mon, 25 Sep 2017)
Log Message
Fix the macOS WebKit CMake build
* CMakeLists.txt:
Before r222194, this -umbrella flag mentioned "WebKit" twice:
first, the name of the target to affect; second, the name of the
umbrella framework. In r222194, the targets were renamed. It turns
out that a global find and replace isn't a great way to do this,
because it caught the name of the umbrella framework too.
Put it back; the umbrella framework will always be named "WebKit".
This makes it once again possible to link WebKit (before, it was
complaining about us linking directly to WebKitLegacy instead of the
nonsensical WebKitLegacy umbrella framework).
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (222488 => 222489)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2017-09-26 03:29:41 UTC (rev 222488)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2017-09-26 04:19:22 UTC (rev 222489)
@@ -52,7 +52,7 @@
endif ()
if (APPLE)
- set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-umbrella WebKitLegacy")
+ set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-umbrella WebKit")
endif ()
if (MSVC)
Modified: trunk/Source/WebKitLegacy/ChangeLog (222488 => 222489)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-09-26 03:29:41 UTC (rev 222488)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-09-26 04:19:22 UTC (rev 222489)
@@ -1,3 +1,20 @@
+2017-09-25 Timothy Horton <[email protected]>
+
+ Fix the macOS WebKit CMake build
+
+ * CMakeLists.txt:
+ Before r222194, this -umbrella flag mentioned "WebKit" twice:
+ first, the name of the target to affect; second, the name of the
+ umbrella framework. In r222194, the targets were renamed. It turns
+ out that a global find and replace isn't a great way to do this,
+ because it caught the name of the umbrella framework too.
+
+ Put it back; the umbrella framework will always be named "WebKit".
+
+ This makes it once again possible to link WebKit (before, it was
+ complaining about us linking directly to WebKitLegacy instead of the
+ nonsensical WebKitLegacy umbrella framework).
+
2017-09-25 Chris Dumez <[email protected]>
Make StoredCredentials an enum class and rename its header
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
