diff --git a/build/cmake/lib/webview_chromium/cef_download.cmake.in b/build/cmake/lib/webview_chromium/cef_download.cmake.in index 3eb67b513c..98641fb6fd 100644 --- a/build/cmake/lib/webview_chromium/cef_download.cmake.in +++ b/build/cmake/lib/webview_chromium/cef_download.cmake.in @@ -7,7 +7,10 @@ # Licence: wxWindows licence ############################################################################# -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) +if(POLICY CMP0135) + cmake_policy(SET CMP0135 NEW) +endif() project(cef-download NONE) @@ -21,5 +24,5 @@ ExternalProject_Add(cef CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - TEST_COMMAND "" + TEST_COMMAND "" ) diff --git a/build/cmake/lib/webview_chromium/cef_update_version_info.cmake b/build/cmake/lib/webview_chromium/cef_update_version_info.cmake index 692ce81383..792b184f82 100644 --- a/build/cmake/lib/webview_chromium/cef_update_version_info.cmake +++ b/build/cmake/lib/webview_chromium/cef_update_version_info.cmake @@ -16,11 +16,11 @@ if(NOT DEFINED CEF_VERSION) message(FATAL_ERROR "CEF_VERSION not defined") endif() -set(CEF_BASE_URL "http://opensource.spotify.com/cefbuilds/cef_binary_") +set(CEF_BASE_URL "https://cef-builds.spotifycdn.com/cef_binary_") set(CEF_FILE_EXT ".tar.bz2") set(sha_file ${CMAKE_BINARY_DIR}/__info_sha.txt) -foreach(platform macosx64 linux32 linux64 windows32 windows64) +foreach(platform windows64 windowsarm64 windows32 macosx64 macosarm64 linux64 linuxarm64 linuxarm) file(DOWNLOAD "${CEF_BASE_URL}${CEF_VERSION}_${platform}${CEF_FILE_EXT}.sha1" "${sha_file}") file(READ "${sha_file}" CEF_SHA1_${platform}) endforeach() @@ -30,5 +30,5 @@ file(REMOVE ${sha_file}) configure_file( cef_version_info.cmake.in cef_version_info.cmake - @ONLY + @ONLY NEWLINE_STYLE LF ) diff --git a/build/cmake/lib/webview_chromium/cef_version_info.cmake b/build/cmake/lib/webview_chromium/cef_version_info.cmake index aec9ec1b5f..6139575bb1 100644 --- a/build/cmake/lib/webview_chromium/cef_version_info.cmake +++ b/build/cmake/lib/webview_chromium/cef_version_info.cmake @@ -13,25 +13,52 @@ # To update the include file see cef_update_version_info.cmake if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(CEF_PLATFORM "macosx64") - set(CEF_SHA1 "c0e6185629077400630ca942f67b892f5a56be5b") + if(CMAKE_SIZEOF_VOID_P LESS 8) + message(ERROR "Unsupported macOS system") + else() + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "macosarm64") + set(CEF_SHA1 "289ba3c54d801f757ef527f581ce49bd135c37d6") + else() + set(CEF_PLATFORM "macosx64") + set(CEF_SHA1 "d52703aa67772ef8cbb9d1a264a454f930df795b") + endif() + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SIZEOF_VOID_P LESS 8) - set(CEF_PLATFORM "linux32") - set(CEF_SHA1 "d73fad2f014090baddc2d964b747a78473169faf") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm") + set(CEF_PLATFORM "linuxarm") + set(CEF_SHA1 "4173bc576d34258e7de8624b216c36bfd5b7cbf0") + else() + message(ERROR "Unsupported Linux system") + endif() else() - set(CEF_PLATFORM "linux64") - set(CEF_SHA1 "2ff83db27479ec0d9b5d360bb9a3a52323f536c0") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "linuxarm64") + set(CEF_SHA1 "1a375eeb5d5c8a6df2e5911d5f6cfa25719ec140") + else() + set(CEF_PLATFORM "linux64") + set(CEF_SHA1 "a6b4166a5622a650165fa09c553ddaa9ade2338b") + endif() endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SIZEOF_VOID_P LESS 8) - set(CEF_PLATFORM "windows32") - set(CEF_SHA1 "8d2fff739d05adde4b49fa7e2a52d5fc65ccc532") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm") + message(ERROR "Unsupported Windows system") + else() + set(CEF_PLATFORM "windows32") + set(CEF_SHA1 "f7a9f407108eeefc1469b0b51ada59c38b135de9") + endif() else() - set(CEF_PLATFORM "windows64") - set(CEF_SHA1 "87603cc75641e84d12c97dd7dbad09031dd7af68") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "windowsarm64") + set(CEF_SHA1 "0a6286fafdf30f560bfff6a9bd6604ddaa9ff433") + else() + set(CEF_PLATFORM "windows64") + set(CEF_SHA1 "5053b25559fbb310d0858e21fd81a2067e7b79b6") + endif() endif() else() message(ERROR "Unsupported CEF system") endif() -set(CEF_URL "http://opensource.spotify.com/cefbuilds/cef_binary_3.3282.1733.g9091548_${CEF_PLATFORM}.tar.bz2") +set(CEF_URL "https://cef-builds.spotifycdn.com/cef_binary_119.4.7+g55e15c8+chromium-119.0.6045.199_${CEF_PLATFORM}.tar.bz2") diff --git a/build/cmake/lib/webview_chromium/cef_version_info.cmake.in b/build/cmake/lib/webview_chromium/cef_version_info.cmake.in index 09e3fa64a1..7877725302 100644 --- a/build/cmake/lib/webview_chromium/cef_version_info.cmake.in +++ b/build/cmake/lib/webview_chromium/cef_version_info.cmake.in @@ -13,23 +13,50 @@ # To update the include file see cef_update_version_info.cmake if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(CEF_PLATFORM "macosx64") - set(CEF_SHA1 "@CEF_SHA1_macosx64@") + if(CMAKE_SIZEOF_VOID_P LESS 8) + message(ERROR "Unsupported macOS system") + else() + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "macosarm64") + set(CEF_SHA1 "@CEF_SHA1_macosarm64@") + else() + set(CEF_PLATFORM "macosx64") + set(CEF_SHA1 "@CEF_SHA1_macosx64@") + endif() + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SIZEOF_VOID_P LESS 8) - set(CEF_PLATFORM "linux32") - set(CEF_SHA1 "@CEF_SHA1_linux32@") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm") + set(CEF_PLATFORM "linuxarm") + set(CEF_SHA1 "@CEF_SHA1_linuxarm@") + else() + message(ERROR "Unsupported Linux system") + endif() else() - set(CEF_PLATFORM "linux64") - set(CEF_SHA1 "@CEF_SHA1_linux64@") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "linuxarm64") + set(CEF_SHA1 "@CEF_SHA1_linuxarm64@") + else() + set(CEF_PLATFORM "linux64") + set(CEF_SHA1 "@CEF_SHA1_linux64@") + endif() endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SIZEOF_VOID_P LESS 8) - set(CEF_PLATFORM "windows32") - set(CEF_SHA1 "@CEF_SHA1_windows32@") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm") + message(ERROR "Unsupported Windows system") + else() + set(CEF_PLATFORM "windows32") + set(CEF_SHA1 "@CEF_SHA1_windows32@") + endif() else() - set(CEF_PLATFORM "windows64") - set(CEF_SHA1 "@CEF_SHA1_windows64@") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set(CEF_PLATFORM "windowsarm64") + set(CEF_SHA1 "@CEF_SHA1_windowsarm64@") + else() + set(CEF_PLATFORM "windows64") + set(CEF_SHA1 "@CEF_SHA1_windows64@") + endif() endif() else() message(ERROR "Unsupported CEF system")