Diff
Modified: trunk/CMakeLists.txt (273983 => 273984)
--- trunk/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -6,7 +6,11 @@
# latter in particular handles loading a bunch of shared CMake definitions
# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE.
#
-cmake_minimum_required(VERSION 3.10)
+# cmake_minimum_required is also set inside Source/${FRAMEWORK}/CMakeLists.txt
+# in support of the AppleWin internal build so this version should be kept in
+# sync across those files.
+#
+cmake_minimum_required(VERSION 3.12)
project(WebKit)
# -----------------------------------------------------------------------------
Modified: trunk/ChangeLog (273983 => 273984)
--- trunk/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,19 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Updates the minimum version to 3.12. In CMake 3.12 OBJECT library functionality was
+ expanded to the point where they can successfully be used as a replacement for
+ --whole-archive within WebKit. The check in JSCOnly for the minimum version before
+ using hidden visibility was removed accordingly.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsJSCOnly.cmake:
+
2021-03-05 ChangSeok Oh <changs...@webkit.org>
AVIF decoding support
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (273983 => 273984)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,6 +1,8 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
+
include(WebKitCommon)
include(target/TargetWTF)
+
set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
list(APPEND _javascript_Core_UNIFIED_SOURCE_LIST_FILES
Modified: trunk/Source/_javascript_Core/ChangeLog (273983 => 273984)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,15 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Sync cmake_minimum_required version for AppleWin internal builds.
+
+ * CMakeLists.txt:
+
2021-03-05 Tadeu Zagallo <tzaga...@apple.com>
OpGetPrivateName needs to be listed in FOR_EACH_OPCODE_WITH_VALUE_PROFILE
Modified: trunk/Source/WTF/CMakeLists.txt (273983 => 273984)
--- trunk/Source/WTF/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WTF/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
include(WebKitCommon)
set_property(DIRECTORY . PROPERTY FOLDER "WTF")
Modified: trunk/Source/WTF/ChangeLog (273983 => 273984)
--- trunk/Source/WTF/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WTF/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,15 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Sync cmake_minimum_required version for AppleWin internal builds.
+
+ * CMakeLists.txt:
+
2021-03-05 Chris Dumez <cdu...@apple.com>
Reduce use of CFRetain() / CFRelease() / CFAutoRelease() in WebKit
Modified: trunk/Source/WebCore/CMakeLists.txt (273983 => 273984)
--- trunk/Source/WebCore/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
include(WebKitCommon)
include(target/TargetWTF)
Modified: trunk/Source/WebCore/ChangeLog (273983 => 273984)
--- trunk/Source/WebCore/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebCore/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,15 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Sync cmake_minimum_required version for AppleWin internal builds.
+
+ * CMakeLists.txt:
+
2021-03-05 Simon Fraser <simon.fra...@apple.com>
sticky position incorrect behavior in table with dir=RTL
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (273983 => 273984)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,9 +1,11 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
+
include(WebKitCommon)
include(target/TargetWTF)
include(target/TargetJavaScriptCore)
include(target/PAL)
include(target/WebCore)
+
set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
set(WebKitLegacy_SOURCES
Modified: trunk/Source/WebKitLegacy/ChangeLog (273983 => 273984)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,15 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Sync cmake_minimum_required version for AppleWin internal builds.
+
+ * CMakeLists.txt:
+
2021-02-08 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r272480, r272481, and r272500.
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (273983 => 273984)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,3 +1,15 @@
+2021-03-05 Don Olmstead <don.olmst...@sony.com>
+
+ [CMake] Bump cmake_minimum_required version to 3.12 or later
+ https://bugs.webkit.org/show_bug.cgi?id=221727
+ <rdar://problem/74454980>
+
+ Reviewed by Konstantin Tokarev.
+
+ Sync cmake_minimum_required version for AppleWin internal builds.
+
+ * WebKitQuartzCoreAdditions/CMakeLists.txt:
+
2021-03-05 Chris Dumez <cdu...@apple.com>
Reduce use of CFRetain() / CFRelease() / CFAutoRelease() in WebKit
Modified: trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt (273983 => 273984)
--- trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2021-03-05 19:12:45 UTC (rev 273984)
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.12)
+
include(WebKitCommon)
add_definitions(
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (273983 => 273984)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2021-03-05 18:53:56 UTC (rev 273983)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2021-03-05 19:12:45 UTC (rev 273984)
@@ -3,15 +3,6 @@
if (MSVC)
include(OptionsMSVC)
else ()
- # CMake uses OBJECT libraries as a cross platform way of doing --whole-archive which is needed
- # when compiling bmalloc/WTF into _javascript_Core. However they were extremely limited prior to
- # CMake 3.12 <https://gitlab.kitware.com/cmake/cmake/-/issues/18010>
- #
- # FIXME: Remove when cmake_minimum_required is raised https://bugs.webkit.org/show_bug.cgi?id=221727
- if (CMAKE_VERSION VERSION_LESS 3.12)
- message(FATAL_ERROR "CMake 3.12 or greater is required to compile JSCOnly")
- endif ()
-
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
