mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

CMakeDetermineSystem: use execute_process() vs. exec_program()

Browse Source
This commit is contained in:
Michael Hirsch
2022-11-07 14:37:03 -05:00
parent 168b82e68b
commit a44d415ed3
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Modules/CMakeDetermineSystem.cmake
View File

@@ -33,20 +33,32 @@
# find out on which system cmake runs
if(CMAKE_HOST_UNIX)
find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin /usr/local/bin)
if(CMAKE_UNAME)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX")
exec_program(${CMAKE_UNAME} ARGS -v OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MAJOR_VERSION)
exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MINOR_VERSION)
execute_process(COMMAND ${CMAKE_UNAME} -v
OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MAJOR_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
execute_process(COMMAND ${CMAKE_UNAME} -r
OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MINOR_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
set(CMAKE_HOST_SYSTEM_VERSION "${_CMAKE_HOST_SYSTEM_MAJOR_VERSION}.${_CMAKE_HOST_SYSTEM_MINOR_VERSION}")
unset(_CMAKE_HOST_SYSTEM_MAJOR_VERSION)
unset(_CMAKE_HOST_SYSTEM_MINOR_VERSION)
else()
exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
execute_process(COMMAND ${CMAKE_UNAME} -r
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
endif()
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|MSYS.*|^GNU$|Android")
exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
execute_process(COMMAND ${CMAKE_UNAME} -m
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RESULT_VARIABLE val
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
# If we are running on Apple Silicon, honor CMAKE_APPLE_SILICON_PROCESSOR.
if(DEFINED CMAKE_APPLE_SILICON_PROCESSOR)
@@ -74,8 +86,11 @@ if(CMAKE_HOST_UNIX)
if(_CMAKE_APPLE_SILICON_PROCESSOR)
set(CMAKE_HOST_SYSTEM_PROCESSOR "${_CMAKE_APPLE_SILICON_PROCESSOR}")
else()
exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
execute_process(COMMAND ${CMAKE_UNAME} -m
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RESULT_VARIABLE val
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
endif()
unset(_CMAKE_APPLE_SILICON_PROCESSOR)
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "Power Macintosh")
@@ -83,14 +98,23 @@ if(CMAKE_HOST_UNIX)
set(CMAKE_HOST_SYSTEM_PROCESSOR "powerpc")
endif()
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
exec_program(arch ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
execute_process(COMMAND arch -s
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RESULT_VARIABLE val
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
else()
exec_program(${CMAKE_UNAME} ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
execute_process(COMMAND ${CMAKE_UNAME} -p
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RESULT_VARIABLE val
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
if("${val}" GREATER 0)
exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
execute_process(COMMAND ${CMAKE_UNAME} -m
OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RESULT_VARIABLE val
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
endif()
endif()
# check the return of the last uname -m or -p