Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

Fix ubuntu arch name #583

Merged
merged 4 commits into from
Aug 4, 2021
Merged

Fix ubuntu arch name #583

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65a6403
fix ubuntu arch name
laura-ding Jul 9, 2021
ed396ef
rebase upstream
laura-ding Jul 28, 2021
a670c0e
add condition
laura-ding Aug 3, 2021
f3e933a
Merge branch 'master' into fix_ubuntu_arch
laura-ding Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions cmake/CPackage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,15 @@ macro(package to_one name home_page scripts_dir)
set(HOST_SYSTEM_VER "Unknown")
endif()
elseif (EXISTS "/etc/lsb-release")
set(HOST_SYSTEM_NAME "ubuntu")
set(CPACK_GENERATOR "DEB")
file (STRINGS "/etc/lsb-release" SYSTEM_NAME)
execute_process(
COMMAND echo "${SYSTEM_NAME}"
COMMAND cut -d ";" -f 1
COMMAND cut -d "=" -f 2
OUTPUT_VARIABLE HOST_SYSTEM_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND echo "${SYSTEM_NAME}"
COMMAND cut -d ";" -f 2
Expand All @@ -54,6 +60,15 @@ macro(package to_one name home_page scripts_dir)
)
string(REPLACE "." "" HOST_SYSTEM_VER ${HOST_SYSTEM_VER})
string(CONCAT HOST_SYSTEM_VER ${HOST_SYSTEM_NAME} ${HOST_SYSTEM_VER})
if (${HOST_SYSTEM_NAME} MATCHES "Ubuntu")
# the ubuntu need to modify the architecture name
if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64")
set(CMAKE_HOST_SYSTEM_PROCESSOR "amd64")
endif()
# Adapt the Kylin system
elseif (${HOST_SYSTEM_NAME} MATCHES "Kylin" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64")
endif()
elseif (EXISTS "/etc/issue")
file (STRINGS "/etc/issue" SYSTEM_NAME)
execute_process(
Expand All @@ -79,17 +94,7 @@ macro(package to_one name home_page scripts_dir)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(CPACK_GENERATOR "DEB")
# Adapt the Kylin system
elseif (${HOST_SYSTEM_NAME} MATCHES "Kylin" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64")
execute_process(
COMMAND echo "${SYSTEM_NAME}"
COMMAND sed -n "1p"
COMMAND cut -d " " -f 2
OUTPUT_VARIABLE HOST_SYSTEM_VER
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(CMAKE_HOST_SYSTEM_PROCESSOR "arm64")
set(CPACK_GENERATOR "DEB")
# Adapt the NeoKylin system
elseif (${HOST_SYSTEM_NAME} MATCHES "NeoKylin" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "mips64")
execute_process(
COMMAND echo "${SYSTEM_NAME}"
Expand Down