feat: remove sandbox switch for CEF 138+ on Windows and macOS

Author: tishion

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.19.1)
 project(CefViewCore)
 
-option(USE_SANDBOX "Enable CEF Sandbox" OFF)
+option(USE_SANDBOX "Enable CEF Sandbox (Deprecated since CEF 138)" OFF)
 
 option(STATIC_CRT "Use MultiThreaded linkage for MSVC" OFF)
 

cmake/SetupCef.cmake

@@ -103,26 +103,6 @@ if(${CMAKE_VERSION} GREATER "3.12")
   cmake_policy(SET CMP0077 NEW)
 endif()
 
-if(OS_WINDOWS)
-  add_link_options(/DEBUG)
-
-  if(USE_SANDBOX)
-    # cef_sandbox.lib is MT already, must keep the same with it
-    set(CEF_RUNTIME_LIBRARY_FLAG "/MT" CACHE STRING "Use static runtime")
-    add_compile_options("/MT$<$<CONFIG:Debug>:d>")
-  else()
-    # either MT or MD is supported
-    set(CEF_RUNTIME_LIBRARY_FLAG "/M$<IF:$<BOOL:${STATIC_CRT}>,T,D>" CACHE STRING "Use static runtime" FORCE)
-    add_compile_options("/M$<IF:$<BOOL:${STATIC_CRT}>,T,D>$<$<CONFIG:Debug>:d>")
-  endif()
-else()
-  add_compile_options(
-    "-g"
-    "$<$<CONFIG:DEBUG>:-O0>"
-    "$<$<CONFIG:RELEASE>:-O3>"
-  )
-endif()
-
 # Append CEF root dir to CMAKE_MODULE_PATH
 set(CEF_ROOT "${CEF_SDK_DIR}")
 list(APPEND CMAKE_MODULE_PATH "${CEF_ROOT}/cmake")
@@ -131,14 +111,6 @@ find_package(CEF REQUIRED)
 # Add libcef dll wrapper
 add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
 
-if(USE_SANDBOX AND(OS_WINDOWS OR OS_MACOS))
-  add_definitions(-DCEF_USE_SANDBOX)
-
-  # message(STATUS "cef_sandbox_lib path:" "${CEF_SANDBOX_LIB_DEBUG}," "${CEF_SANDBOX_LIB_RELEASE}" )
-  # Logical target used to link the cef_sandbox library.
-  ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
-endif()
-
 PRINT_CEF_CONFIG()
 
 # #################################################################################
@@ -189,3 +161,34 @@ if(${Need_Config_CefVersion_File})
 else()
   message(STATUS "No need to configure CefVersion.h file")
 endif()
+
+# config CEF sandbox
+if(OS_MACOS OR OS_WINDOWS)
+  if(CEF_VERSION_MAJOR LESS 138)
+    if(USE_SANDBOX)
+      add_definitions(-DCEF_USE_SANDBOX)
+      message(STATUS "cef_sandbox_lib path:" "${CEF_SANDBOX_LIB_DEBUG}," "${CEF_SANDBOX_LIB_RELEASE}")
+      ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
+    endif()
+  endif()
+endif()
+
+if(OS_WINDOWS)
+  add_link_options(/DEBUG)
+
+  if(USE_SANDBOX AND(CEF_VERSION_MAJOR LESS 138))
+    # cef_sandbox.lib is MT already, must keep the same with it
+    set(CEF_RUNTIME_LIBRARY_FLAG "/MT" CACHE STRING "Use static runtime")
+    add_compile_options("/MT$<$<CONFIG:Debug>:d>")
+  else()
+    # either MT or MD is supported
+    set(CEF_RUNTIME_LIBRARY_FLAG "/M$<IF:$<BOOL:${STATIC_CRT}>,T,D>" CACHE STRING "Use static runtime" FORCE)
+    add_compile_options("/M$<IF:$<BOOL:${STATIC_CRT}>,T,D>$<$<CONFIG:Debug>:d>")
+  endif()
+else()
+  add_compile_options(
+    "-g"
+    "$<$<CONFIG:DEBUG>:-O0>"
+    "$<$<CONFIG:RELEASE>:-O3>"
+  )
+endif()

include/CefVersion.h

@@ -13,12 +13,12 @@
 #pragma once
 
 // clang-format off
-#define CEF_VERSION "127.3.5+g114ea2a+chromium-127.0.6533.120"
-#define CEF_VERSION_MAJOR 127
-#define CEF_VERSION_MINOR 3
-#define CEF_VERSION_PATCH 5
-#define CEF_COMMIT_NUMBER 3037
-#define CEF_COMMIT_HASH "114ea2af1ba9da18c4ac5e599ccdbb17d01ba75a"
+#define CEF_VERSION "142.0.15+g6dfdb28+chromium-142.0.7444.176"
+#define CEF_VERSION_MAJOR 142
+#define CEF_VERSION_MINOR 0
+#define CEF_VERSION_PATCH 15
+#define CEF_COMMIT_NUMBER 3314
+#define CEF_COMMIT_HASH "6dfdb28d752a47e189d7a23b01f368ab0bdb378d"
 // clang-format on
 
 #endif // CefVersion

src/CMakeLists.txt

@@ -70,7 +70,7 @@ if(OS_WINDOWS)
     ${CEF_STANDARD_LIBS}
   )
 
-  if(USE_SANDBOX)
+  if(USE_SANDBOX AND(CEF_VERSION_MAJOR LESS 138))
     list(APPEND CefViewCore_LIBS cef_sandbox_lib)
   endif()
 
@@ -135,7 +135,7 @@ if(OS_MACOS)
     ${CEF_STANDARD_LIBS}
   )
 
-  if(USE_SANDBOX)
+  if(USE_SANDBOX AND(CEF_VERSION_MAJOR LESS 138))
     list(APPEND CefViewCore_LIBS cef_sandbox_lib)
   endif()
 
@@ -230,7 +230,7 @@ if(OS_WINDOWS)
     ${CEF_SANDBOX_STANDARD_LIBS}
   )
 
-  if(USE_SANDBOX AND CEF_VERSION_MAJOR LESS 138)
+  if(USE_SANDBOX AND(CEF_VERSION_MAJOR LESS 138))
     list(APPEND _helper_libs cef_sandbox_lib)
   endif()
 
@@ -367,7 +367,7 @@ if(OS_MACOS)
     ${CEF_STANDARD_LIBS}
   )
 
-  if(USE_SANDBOX)
+  if(USE_SANDBOX AND(CEF_VERSION_MAJOR LESS 138))
     list(APPEND CefViewWing_LIBS cef_sandbox_lib)
   endif()