- Revision
- 220091
- Author
- [email protected]
- Date
- 2017-08-01 01:08:56 -0700 (Tue, 01 Aug 2017)
Log Message
[CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
https://bugs.webkit.org/show_bug.cgi?id=174855
Reviewed by Carlos Garcia Campos.
.:
Create derived sources directories in WebKitCommon.cmake instead of WebKitFS.cmake, which is
too soon. I tried changing the include order, but other stuff in WebKitFS.cmake really is
needed before including the port options file.
* Source/cmake/WebKitCommon.cmake:
* Source/cmake/WebKitFS.cmake:
Source/WebDriver:
Don't create derived sources directory here anymore.
* PlatformGTK.cmake:
Source/WebKit:
Don't create derived sources directory here anymore.
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (220090 => 220091)
--- trunk/ChangeLog 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/ChangeLog 2017-08-01 08:08:56 UTC (rev 220091)
@@ -1,3 +1,17 @@
+2017-08-01 Michael Catanzaro <[email protected]>
+
+ [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
+ https://bugs.webkit.org/show_bug.cgi?id=174855
+
+ Reviewed by Carlos Garcia Campos.
+
+ Create derived sources directories in WebKitCommon.cmake instead of WebKitFS.cmake, which is
+ too soon. I tried changing the include order, but other stuff in WebKitFS.cmake really is
+ needed before including the port options file.
+
+ * Source/cmake/WebKitCommon.cmake:
+ * Source/cmake/WebKitFS.cmake:
+
2017-07-29 Yusuke Suzuki <[email protected]>
Unreviewed, build fix for GTK and WPE about StorageProcess renaming
Modified: trunk/Source/WebDriver/ChangeLog (220090 => 220091)
--- trunk/Source/WebDriver/ChangeLog 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebDriver/ChangeLog 2017-08-01 08:08:56 UTC (rev 220091)
@@ -1,3 +1,14 @@
+2017-08-01 Michael Catanzaro <[email protected]>
+
+ [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
+ https://bugs.webkit.org/show_bug.cgi?id=174855
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't create derived sources directory here anymore.
+
+ * PlatformGTK.cmake:
+
2017-07-26 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK distcheck.
Modified: trunk/Source/WebDriver/PlatformGTK.cmake (220090 => 220091)
--- trunk/Source/WebDriver/PlatformGTK.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebDriver/PlatformGTK.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -1,5 +1,3 @@
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
-
set(WebDriver_Process_OUTPUT_NAME WebKitWebDriver)
add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
Modified: trunk/Source/WebKit/ChangeLog (220090 => 220091)
--- trunk/Source/WebKit/ChangeLog 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebKit/ChangeLog 2017-08-01 08:08:56 UTC (rev 220091)
@@ -1,3 +1,16 @@
+2017-08-01 Michael Catanzaro <[email protected]>
+
+ [CMake] WebKitFS.cmake depends on options set in Option cmake files that are included later
+ https://bugs.webkit.org/show_bug.cgi?id=174855
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't create derived sources directory here anymore.
+
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWPE.cmake:
+
2017-07-31 Daniel Bates <[email protected]>
WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction() may not be able to
Modified: trunk/Source/WebKit/PlatformGTK.cmake (220090 => 220091)
--- trunk/Source/WebKit/PlatformGTK.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -4,7 +4,6 @@
set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
set(WebKit2_StorageProcess_OUTPUT_NAME WebKitDatabaseProcess)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
Modified: trunk/Source/WebKit/PlatformMac.cmake (220090 => 220091)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -383,8 +383,6 @@
WebProcess/mac/SecItemShimLibrary.mm
)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
-
list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${PAL_DIR}"
"${WEBKIT2_DIR}/NetworkProcess/cocoa"
Modified: trunk/Source/WebKit/PlatformWPE.cmake (220090 => 220091)
--- trunk/Source/WebKit/PlatformWPE.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -1,4 +1,3 @@
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPE_API_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
Modified: trunk/Source/cmake/WebKitCommon.cmake (220090 => 220091)
--- trunk/Source/cmake/WebKitCommon.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/cmake/WebKitCommon.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -57,8 +57,28 @@
include(Options${PORT})
# -----------------------------------------------------------------------------
+ # Create derived sources directories
+ # -----------------------------------------------------------------------------
+
+ if (ENABLE_WEBCORE)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
+ endif ()
+
+ if (ENABLE_WEBKIT)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+ endif ()
+
+ if (ENABLE_WEBKIT_LEGACY)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
+ endif ()
+
+ if (ENABLE_WEBDRIVER)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
+ endif ()
+
+ # -----------------------------------------------------------------------------
# config.h
# -----------------------------------------------------------------------------
-
CREATE_CONFIGURATION_HEADER()
endif ()
Modified: trunk/Source/cmake/WebKitFS.cmake (220090 => 220091)
--- trunk/Source/cmake/WebKitFS.cmake 2017-08-01 06:42:51 UTC (rev 220090)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-08-01 08:08:56 UTC (rev 220091)
@@ -47,20 +47,3 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
-
-if (ENABLE_WEBCORE)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
-endif ()
-
-if (ENABLE_WEBKIT)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
-endif ()
-
-if (ENABLE_WEBKIT_LEGACY)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
-endif ()
-
-if (ENABLE_WEBDRIVER)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
-endif ()
