Title: [290636] trunk
- Revision
- 290636
- Author
- basuke.suz...@sony.com
- Date
- 2022-03-01 01:36:58 -0800 (Tue, 01 Mar 2022)
Log Message
[CMake] Disabling ENABLE_WEBCORE is ignored when cmake configuration runs again.
https://bugs.webkit.org/show_bug.cgi?id=237170
Reviewed by Fujii Hironori.
CMake variables which has chance to set from outside should be cached in CMake configuration cache.
Unless cacheing, the result of building the generated project is not consisitent because the other
configuration may run while building.
To make it complete, I've changed ENABLE_JAVASCRIPTCORE, ENABLE_WEBCORE and ENABLE_WEBKIT to `option()`
which is stored in cached and reused while building even if the confuguration runs again.
* Source/cmake/OptionsPlayStation.cmake:
* Source/cmake/WebKitCommon.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (290635 => 290636)
--- trunk/ChangeLog 2022-03-01 09:01:13 UTC (rev 290635)
+++ trunk/ChangeLog 2022-03-01 09:36:58 UTC (rev 290636)
@@ -1,3 +1,20 @@
+2022-03-01 Basuke Suzuki <basuke.suz...@sony.com>
+
+ [CMake] Disabling ENABLE_WEBCORE is ignored when cmake configuration runs again.
+ https://bugs.webkit.org/show_bug.cgi?id=237170
+
+ Reviewed by Fujii Hironori.
+
+ CMake variables which has chance to set from outside should be cached in CMake configuration cache.
+ Unless cacheing, the result of building the generated project is not consisitent because the other
+ configuration may run while building.
+
+ To make it complete, I've changed ENABLE_JAVASCRIPTCORE, ENABLE_WEBCORE and ENABLE_WEBKIT to `option()`
+ which is stored in cached and reused while building even if the confuguration runs again.
+
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/WebKitCommon.cmake:
+
2022-02-28 Brandon Stewart <brandonstew...@apple.com>
Add Brandon Stewart's name to contributors.json
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (290635 => 290636)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2022-03-01 09:01:13 UTC (rev 290635)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2022-03-01 09:36:58 UTC (rev 290636)
@@ -17,15 +17,9 @@
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-dll-attribute-on-redeclaration)
set(ENABLE_API_TESTS ON CACHE BOOL "Build API Tests")
-set(ENABLE_WEBCORE ON CACHE BOOL "Build WebCore")
-set(ENABLE_WEBKIT ON CACHE BOOL "Build WebKit")
set(ENABLE_WEBKIT_LEGACY OFF)
set(ENABLE_WEBINSPECTORUI OFF)
-if (NOT ENABLE_WEBCORE)
- set(ENABLE_WEBKIT OFF)
-endif ()
-
WEBKIT_OPTION_BEGIN()
# PlayStation Specific Options
Modified: trunk/Source/cmake/WebKitCommon.cmake (290635 => 290636)
--- trunk/Source/cmake/WebKitCommon.cmake 2022-03-01 09:01:13 UTC (rev 290635)
+++ trunk/Source/cmake/WebKitCommon.cmake 2022-03-01 09:36:58 UTC (rev 290636)
@@ -13,13 +13,18 @@
message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}")
endif ()
- set(ENABLE_JAVASCRIPTCORE ON)
- set(ENABLE_WEBCORE ON)
+ option(ENABLE_JAVASCRIPTCORE "Enable building _javascript_Core" ON)
+ option(ENABLE_WEBCORE "Enable building _javascript_Core" ON)
+ option(ENABLE_WEBKIT "Enable building WebKit" ON)
- if (NOT DEFINED ENABLE_WEBKIT)
- set(ENABLE_WEBKIT ON)
+ if (NOT ENABLE_JAVASCRIPTCORE)
+ set(ENABLE_WEBCORE OFF)
endif ()
+ if (NOT ENABLE_WEBCORE)
+ set(ENABLE_WEBKIT OFF)
+ endif ()
+
if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools")
set(ENABLE_TOOLS ON)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
