diff options
| author | Brad King <brad.king@kitware.com> | 2011-05-03 17:43:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-05-03 17:43:09 (GMT) |
| commit | db96c05f74c74dad34b6096e2a15a455ebe2b437 (patch) | |
| tree | 8c19847475f290e2aa84d036eddf8131028572d1 | |
| parent | 9c84f747c30ff706f27e250ef67a6889ef6ab794 (diff) | |
| parent | 0bfabf967fa6efdcac40f3f2e3731795eaab9256 (diff) | |
| download | CMake-db96c05f74c74dad34b6096e2a15a455ebe2b437.zip CMake-db96c05f74c74dad34b6096e2a15a455ebe2b437.tar.gz CMake-db96c05f74c74dad34b6096e2a15a455ebe2b437.tar.bz2 | |
Merge topic 'OpenBSD-host-processor-issue-12143'
0bfabf9 OpenBSD: Use 'arch -s' for host processor (#12143)
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index 0e65bce..7ae3775 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -50,14 +50,17 @@ IF(CMAKE_HOST_UNIX) IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*") EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR RETURN_VALUE val) - ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*") + ELSEIF(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD") + EXEC_PROGRAM(arch ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR + RETURN_VALUE val) + ELSE() EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR RETURN_VALUE val) IF("${val}" GREATER 0) EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR RETURN_VALUE val) ENDIF("${val}" GREATER 0) - ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*") + ENDIF() # check the return of the last uname -m or -p IF("${val}" GREATER 0) SET(CMAKE_HOST_SYSTEM_PROCESSOR "unknown") |