Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cmake] check present "CPU" variable on PrepareEnv, if empty use CMAKE_SYSTEM_PROCESSOR #16547

Merged
merged 1 commit into from
Sep 1, 2019
Merged

[cmake] check present "CPU" variable on PrepareEnv, if empty use CMAKE_SYSTEM_PROCESSOR #16547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions cmake/scripts/common/PrepareEnv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ endif()

set(PLATFORM_TAG ${CORE_SYSTEM_NAME})

# The CPU variable is given either by ./tools/depends or by the
# ./cmake/scripts/common/ArchSetup.cmake (which refers to the Kodi building
# itself). However, this file is only used by addons, so CPU can not always
# be defined, so in this case, if empty, the base CPU will be used.
if(NOT CPU)
set(CPU ${CMAKE_SYSTEM_PROCESSOR})
endif()

if(CORE_SYSTEM_NAME STREQUAL android)
if (CPU MATCHES "v7a")
set(PLATFORM_TAG ${PLATFORM_TAG}-armv7)
Expand Down