Skip to content
Snippets Groups Projects
Commit 6782a6a1 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: move from main tree handle uname without -p correctly

parent 3d4c7887
No related branches found
No related tags found
No related merge requests found
......@@ -31,16 +31,19 @@ IF(UNIX)
IF(CMAKE_UNAME)
EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_SYSTEM_NAME)
EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_SYSTEM_VERSION)
EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "--help")
EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
ENDIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "--help")
IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "--help")
EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
RETURN_VALUE val)
IF(${val} GREATER 0)
EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
RETURN_VALUE val)
ENDIF(${val} GREATER 0)
IF(${val} GREATER 0)
SET(CMAKE_SYSTEM_PROCESSOR "unknown")
ENDIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "--help")
ENDIF(${val} GREATER 0)
SET(CMAKE_UNAME ${CMAKE_UNAME} CACHE INTERNAL "uname command")
# processor may have double quote in the name, and that needs to be removed
STRING(REGEX REPLACE "\"" "" CMAKE_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
STRING(REGEX REPLACE "/" "_" CMAKE_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
ENDIF(CMAKE_UNAME)
ELSE(UNIX)
IF(WIN32)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment