-
Notifications
You must be signed in to change notification settings - Fork 272
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The patches are from https://github.com/dimitry-ishenko-casparcg/chromium-embedded-117
- Loading branch information
1 parent
5f6c983
commit 60f4dd9
Showing
7 changed files
with
131 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/amd64/CMakeLists.txt 2024-09-06 10:07:47.304480286 -0400 | ||
| +++ b/amd64/CMakeLists.txt 2023-10-12 02:54:15.000000000 -0400 | ||
| @@ -133,7 +133,7 @@ | ||
| # | ||
|
|
||
| # For VS2022 and Xcode 12+ support. | ||
| -cmake_minimum_required(VERSION 3.21) | ||
| +cmake_minimum_required(VERSION 3.16) | ||
|
|
||
| # Only generate Debug and Release configuration types. | ||
| set(CMAKE_CONFIGURATION_TYPES Debug Release) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- a/amd64/cmake/cef_variables.cmake | ||
| +++ b/amd64/cmake/cef_variables.cmake | ||
| @@ -26,9 +26,10 @@ endif() | ||
|
|
||
| # Determine the project architecture. | ||
| if(NOT DEFINED PROJECT_ARCH) | ||
| - if(("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64") OR | ||
| - ("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM64")) | ||
| + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") | ||
| set(PROJECT_ARCH "arm64") | ||
| + elseif(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")) | ||
| + set(PROJECT_ARCH "arm") | ||
| elseif(CMAKE_SIZEOF_VOID_P MATCHES 8) | ||
| set(PROJECT_ARCH "x86_64") | ||
| else() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| --- a/amd64/CMakeLists.txt | ||
| +++ b/amd64/CMakeLists.txt | ||
| @@ -253,3 +254,11 @@ if(DOXYGEN_FOUND) | ||
| else() | ||
| message(WARNING "Doxygen must be installed to generate API documentation.") | ||
| endif() | ||
| + | ||
| +# | ||
| +# Install targets. | ||
| +# | ||
| + | ||
| +install(DIRECTORY ${CEF_INCLUDE_DIR}/ DESTINATION ${CEF_INSTALL_INCLUDEDIR}) | ||
| +install(DIRECTORY ${CEF_BINARY_DIR}/ ${CEF_RESOURCE_DIR}/ DESTINATION ${CEF_INSTALL_LIBDIR}) | ||
| +install(PROGRAMS ${CEF_BINARY_DIR}/chrome-sandbox DESTINATION ${CEF_INSTALL_LIBDIR}) | ||
| --- a/amd64/cmake/cef_variables.cmake | ||
| +++ b/amd64/cmake/cef_variables.cmake | ||
| @@ -631,3 +631,17 @@ if(OS_WINDOWS) | ||
| ) | ||
| endif() | ||
| endif() | ||
| + | ||
| +# | ||
| +# Install configuration. | ||
| +# | ||
| + | ||
| +include(GNUInstallDirs) | ||
| + | ||
| +set(VERSION 117) | ||
| +set(CEF_INCLUDE_DIR ${_CEF_ROOT}/include) | ||
| +set(CEF_INSTALL_DIR_SUFFIX cef/${VERSION}) | ||
| + | ||
| +set(CEF_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/${CEF_INSTALL_DIR_SUFFIX}) | ||
| +set(CEF_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/${CEF_INSTALL_DIR_SUFFIX}) | ||
| +set(CEF_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/CEF${VERSION}) | ||
| --- /dev/null | ||
| +++ b/amd64/libcef_dll/CEFConfig.cmake | ||
| @@ -0,0 +1,2 @@ | ||
| +include("${CMAKE_CURRENT_LIST_DIR}/CEFTargets.cmake") | ||
| +add_library(CEF::CEF ALIAS CEF::libcef_dll_wrapper) | ||
| --- a/amd64/libcef_dll/CMakeLists.txt | ||
| +++ b/amd64/libcef_dll/CMakeLists.txt | ||
| @@ -782,3 +782,34 @@ target_compile_definitions(${CEF_TARGET} | ||
|
|
||
| # Remove the default "lib" prefix from the resulting library. | ||
| set_target_properties(${CEF_TARGET} PROPERTIES PREFIX "") | ||
| + | ||
| +# | ||
| +# Install targets. | ||
| +# | ||
| + | ||
| +target_include_directories(${CEF_TARGET} PUBLIC | ||
| + $<BUILD_INTERFACE:${CEF_INCLUDE_DIR}> | ||
| + $<INSTALL_INTERFACE:${CEF_INSTALL_INCLUDEDIR}> | ||
| +) | ||
| +target_link_directories(${CEF_TARGET} PUBLIC | ||
| + $<BUILD_INTERFACE:${CEF_BINARY_DIR}> | ||
| + $<INSTALL_INTERFACE:${CEF_INSTALL_LIBDIR}> | ||
| +) | ||
| +if(OS_WINDOWS) | ||
| + target_link_libraries(${CEF_TARGET} PUBLIC libcef.lib) | ||
| +else() | ||
| + target_link_libraries(${CEF_TARGET} PUBLIC cef) | ||
| +endif() | ||
| + | ||
| +install(TARGETS ${CEF_TARGET} EXPORT CEF DESTINATION ${CEF_INSTALL_LIBDIR}) | ||
| +install(EXPORT CEF FILE CEFTargets.cmake NAMESPACE CEF:: DESTINATION ${CEF_INSTALL_CMAKEDIR}) | ||
| +install(FILES CEFConfig.cmake DESTINATION ${CEF_INSTALL_CMAKEDIR}) | ||
| + | ||
| +include(CMakePackageConfigHelpers) | ||
| +write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/CEFConfigVersion.cmake | ||
| + VERSION ${VERSION} | ||
| + COMPATIBILITY SameMajorVersion | ||
| +) | ||
| +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CEFConfigVersion.cmake DESTINATION ${CEF_INSTALL_CMAKEDIR}) | ||
| + | ||
| +add_library(CEF::CEF ALIAS ${CEF_TARGET}) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters