diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-22 17:52:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-22 17:52:10 (GMT) |
| commit | a60241913cfd5e0d3005b2405b03aacd78c2ba99 (patch) | |
| tree | a511de58a47fd3486efd3b815e82640c29194d2b /Modules | |
| parent | 89884a26fd3cb7804f8add294e77430149e1004b (diff) | |
| parent | 2412d9bc0eb2a70defe860672ad3f0de60bae28d (diff) | |
| download | CMake-a60241913cfd5e0d3005b2405b03aacd78c2ba99.zip CMake-a60241913cfd5e0d3005b2405b03aacd78c2ba99.tar.gz CMake-a60241913cfd5e0d3005b2405b03aacd78c2ba99.tar.bz2 | |
Merge topic 'cygwin-system-processor'
2412d9b Use 'uname -m' for processor on Cygwin (#10774)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index 5589dfc..0e65bce 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -47,17 +47,17 @@ IF(CMAKE_HOST_UNIX) IF(CMAKE_UNAME) EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) - IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") + 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") + ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*") 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") + ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*") # check the return of the last uname -m or -p IF("${val}" GREATER 0) SET(CMAKE_HOST_SYSTEM_PROCESSOR "unknown") |