Skip to content

Commit

Permalink
Fix variable issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve McFarlin committed Mar 27, 2024
1 parent bb5574e commit 1bdb011
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,25 @@ endif()

STRING(REGEX REPLACE "\\+" "%2B" CEF_ESCAPED_VERSION ${CEF_VERSION})

set(USE_SANDBOX OFF)
set(SANDBOX OFF)
# Determine the platform.
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
set(CEF_PLATFORM "macosarm64")
set(USE_SANDBOX ON)
set(SANDBOX ON)
else()
set(CEF_PLATFORM "macosx64")
endif()
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
set(CEF_PLATFORM "linux64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch")
set(CEF_PLATFORM "linuxarm64")
# cef_variables doesn't handle linux/arm64 case yet. See
# https://bitbucket.org/chromiumembedded/cef/issues/3417/project-arch-detection-support-is-missing
set(PROJECT_ARCH "arm64")
else()
set(CEF_PLATFORM "linux64")
endif()
else()
set(CEF_PLATFORM "linux32")
endif()
Expand Down Expand Up @@ -66,8 +73,7 @@ pkg_check_modules(GST REQUIRED gstreamer-1.0
gstreamer-video-1.0
gstreamer-audio-1.0)

message(USE_SANDBOX=${USE_SANDBOX})
if(USE_SANDBOX)
if(SANDBOX)
message("Using the CEF sandbox.")
set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR OFF)
Expand Down

0 comments on commit 1bdb011

Please sign in to comment.