From 6403649bba384d76966324de2029deef7007abda Mon Sep 17 00:00:00 2001 From: Sheen Tian Shen Date: Thu, 28 Mar 2024 22:36:21 +0800 Subject: [PATCH] feat(core): update core --- CMakeLists.txt | 7 ++++--- CefViewCore | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 625ab168..e1f89ed5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,12 +130,13 @@ set_target_properties(libcef_dll_wrapper PROPERTIES FOLDER core) # set need configure QCefView_global to false set(NEED_CONFIGURE_QCefView_global FALSE) +message(STATUS "${CefViewCore_CEF_INCLUDE_DIR}/cef_version.h") file(READ "${CefViewCore_CEF_INCLUDE_DIR}/cef_version.h" cef_version_content) string(REGEX MATCH "#define CEF_VERSION_MAJOR ([0-9]+)" _ ${cef_version_content}) # check CEF_VERSION_MAJOR if(NOT "${CMAKE_MATCH_1}" STREQUAL "${CEF_VERSION_MAJOR}") - set(CEF_VERSION_MAJOR ${CMAKE_MATCH_1} CACHE STRING "CEF Major Version") + set(CEF_VERSION_MAJOR ${CMAKE_MATCH_1} CACHE STRING "CEF Major Version" FORCE) set(NEED_CONFIGURE_QCefView_global TRUE) message(STATUS "CEF_VERSION_MAJOR: ${CEF_VERSION_MAJOR} - Updated!") else() @@ -146,7 +147,7 @@ endif() string(REGEX MATCH "#define CEF_VERSION_MINOR ([0-9]+)" _ ${cef_version_content}) if(NOT "${CMAKE_MATCH_1}" STREQUAL "${CEF_VERSION_MINOR}") - set(CEF_VERSION_MINOR ${CMAKE_MATCH_1} CACHE STRING "CEF Minor Version") + set(CEF_VERSION_MINOR ${CMAKE_MATCH_1} CACHE STRING "CEF Minor Version" FORCE) set(NEED_CONFIGURE_QCefView_global TRUE) message(STATUS "CEF_VERSION_MINOR: ${CEF_VERSION_MINOR} - Updated!") else() @@ -156,7 +157,7 @@ endif() string(REGEX MATCH "#define CEF_VERSION_PATCH ([0-9]+)" _ ${cef_version_content}) if(NOT "${CMAKE_MATCH_1}" STREQUAL "${CEF_VERSION_PATCH}") - set(CEF_VERSION_PATCH ${CMAKE_MATCH_1} CACHE STRING "CEF Patch Version") + set(CEF_VERSION_PATCH ${CMAKE_MATCH_1} CACHE STRING "CEF Patch Version" FORCE) set(NEED_CONFIGURE_QCefView_global TRUE) message(STATUS "CEF_VERSION_PATCH: ${CEF_VERSION_PATCH} - Updated!") else() diff --git a/CefViewCore b/CefViewCore index 9fc274d5..c79fb7f5 160000 --- a/CefViewCore +++ b/CefViewCore @@ -1 +1 @@ -Subproject commit 9fc274d5dd39ebc78d5d5928830000f9e289cba5 +Subproject commit c79fb7f5fe1e697dca3a501570daf30e794ceaeb