Title: [219494] trunk
- Revision
- 219494
- Author
- matthew_han...@apple.com
- Date
- 2017-07-13 20:36:38 -0700 (Thu, 13 Jul 2017)
Log Message
Fix the Mac CMake build.
Unreviewed build fix.
Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
without updating subsequent users of that variable.
* Source/cmake/WebKitFS.cmake:
Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.
Modified Paths
Diff
Modified: trunk/ChangeLog (219493 => 219494)
--- trunk/ChangeLog 2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/ChangeLog 2017-07-14 03:36:38 UTC (rev 219494)
@@ -1,5 +1,18 @@
2017-07-13 Matthew Hanson <matthew_han...@apple.com>
+ Fix the Mac CMake build.
+
+ Unreviewed build fix.
+
+ Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
+ the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
+ without updating subsequent users of that variable.
+
+ * Source/cmake/WebKitFS.cmake:
+ Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.
+
+2017-07-13 Matthew Hanson <matthew_han...@apple.com>
+
Fix the cMake builds (GTK and WPE.)
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Source/cmake/WebKitFS.cmake (219493 => 219494)
--- trunk/Source/cmake/WebKitFS.cmake 2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-07-14 03:36:38 UTC (rev 219494)
@@ -29,7 +29,7 @@
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKIT_LEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
@@ -53,6 +53,6 @@
endif ()
if (ENABLE_WEBKIT_LEGACY)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_LEGACY_DIR})
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
