File tree Expand file tree Collapse file tree 3 files changed +13
-12
lines changed
Expand file tree Collapse file tree 3 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -131,10 +131,11 @@ find_package(CEF REQUIRED)
131131# Add libcef dll wrapper
132132add_subdirectory (${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
133133
134- if (USE_SANDBOX AND (OS_WINDOWS OR OS_MACOS))
134+ # config sandbox lib
135+ if (USE_SANDBOX AND (OS_WINDOWS OR OS_MACOS) AND (CEF_VERSION_MAJOR LESS 138))
135136 add_definitions (-DCEF_USE_SANDBOX)
137+ message (STATUS "cef_sandbox_lib path:" "${CEF_SANDBOX_LIB_DEBUG} ," "${CEF_SANDBOX_LIB_RELEASE} " )
136138
137- # message(STATUS "cef_sandbox_lib path:" "${CEF_SANDBOX_LIB_DEBUG}," "${CEF_SANDBOX_LIB_RELEASE}" )
138139 # Logical target used to link the cef_sandbox library.
139140 ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG} " "${CEF_SANDBOX_LIB_RELEASE} " )
140141endif ()
Original file line number Diff line number Diff line change 1313#pragma once
1414
1515// clang-format off
16- #define CEF_VERSION "127.3.5+g114ea2a +chromium-127 .0.6533.120 "
17- #define CEF_VERSION_MAJOR 127
18- #define CEF_VERSION_MINOR 3
19- #define CEF_VERSION_PATCH 5
20- #define CEF_COMMIT_NUMBER 3037
21- #define CEF_COMMIT_HASH "114ea2af1ba9da18c4ac5e599ccdbb17d01ba75a "
16+ #define CEF_VERSION "142.0.15+g6dfdb28 +chromium-142 .0.7444.176 "
17+ #define CEF_VERSION_MAJOR 142
18+ #define CEF_VERSION_MINOR 0
19+ #define CEF_VERSION_PATCH 15
20+ #define CEF_COMMIT_NUMBER 3314
21+ #define CEF_COMMIT_HASH "6dfdb28d752a47e189d7a23b01f368ab0bdb378d "
2222// clang-format on
2323
2424#endif // CefVersion
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ if(OS_WINDOWS)
7070 ${CEF_STANDARD_LIBS}
7171 )
7272
73- if (USE_SANDBOX)
73+ if (USE_SANDBOX AND (CEF_VERSION_MAJOR LESS 138) )
7474 list (APPEND CefViewCore_LIBS cef_sandbox_lib)
7575 endif ()
7676
@@ -135,7 +135,7 @@ if(OS_MACOS)
135135 ${CEF_STANDARD_LIBS}
136136 )
137137
138- if (USE_SANDBOX)
138+ if (USE_SANDBOX AND (CEF_VERSION_MAJOR LESS 138) )
139139 list (APPEND CefViewCore_LIBS cef_sandbox_lib)
140140 endif ()
141141
@@ -230,7 +230,7 @@ if(OS_WINDOWS)
230230 ${CEF_SANDBOX_STANDARD_LIBS}
231231 )
232232
233- if (USE_SANDBOX AND CEF_VERSION_MAJOR LESS 138)
233+ if (USE_SANDBOX AND ( CEF_VERSION_MAJOR LESS 138) )
234234 list (APPEND _helper_libs cef_sandbox_lib)
235235 endif ()
236236
@@ -367,7 +367,7 @@ if(OS_MACOS)
367367 ${CEF_STANDARD_LIBS}
368368 )
369369
370- if (USE_SANDBOX)
370+ if (USE_SANDBOX AND (CEF_VERSION_MAJOR LESS 138) )
371371 list (APPEND CefViewWing_LIBS cef_sandbox_lib)
372372 endif ()
373373
You can’t perform that action at this time.
0 commit comments