summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Greenblatt <magreenblatt@gmail.com>2023-01-12 13:13:12 -0500
committerMarshall Greenblatt <magreenblatt@gmail.com>2023-01-12 16:46:46 -0500
commit2b906c31b5b3d4bdaea3cd8099504e750fa87e42 (patch)
tree963daed92611c86603783c0948d9c47aa9881c97
parentb65d59f27e2dd73085fbf7178326e2cdb0f4620c (diff)
downloadcef-2b906c31b5b3d4bdaea3cd8099504e750fa87e42.tar.gz
cmake: Set PROJECT_ARCH to the host architecture by default
-rw-r--r--cmake/cef_variables.cmake.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in
index b06ea6bc..8ec7d566 100644
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -26,18 +26,14 @@ endif()
# Determine the project architecture.
if(NOT DEFINED PROJECT_ARCH)
- if(OS_WINDOWS AND "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64")
+ if(("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64") OR
+ ("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM64"))
set(PROJECT_ARCH "arm64")
elseif(CMAKE_SIZEOF_VOID_P MATCHES 8)
set(PROJECT_ARCH "x86_64")
else()
set(PROJECT_ARCH "x86")
endif()
-
- if(OS_MAC)
- # PROJECT_ARCH should be specified on Mac OS X.
- message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
- endif()
endif()
if(${CMAKE_GENERATOR} STREQUAL "Ninja")