diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-02 13:58:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-02 13:58:15 (GMT) |
| commit | 8f545d950166f49bebf92d270d373e7cb98060b8 (patch) | |
| tree | 901c71ecef390a63bdc1e73d7e2060dcbc4c73b2 /Modules | |
| parent | 02bc311138ad8ac0c3653e836a02d54245ae4b12 (diff) | |
| parent | b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa (diff) | |
| download | CMake-8f545d950166f49bebf92d270d373e7cb98060b8.zip CMake-8f545d950166f49bebf92d270d373e7cb98060b8.tar.gz CMake-8f545d950166f49bebf92d270d373e7cb98060b8.tar.bz2 | |
Merge topic 'explicit-system-version'
b31ac171 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
70688609 Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index fa14641..d9f7579 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -123,7 +123,9 @@ elseif(CMAKE_VS_WINCE_VERSION) set(PRESET_CMAKE_SYSTEM_NAME TRUE) else() set(CMAKE_SYSTEM_NAME "${CMAKE_HOST_SYSTEM_NAME}") - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}") + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}") + endif() set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}") set(CMAKE_CROSSCOMPILING FALSE) set(PRESET_CMAKE_SYSTEM_NAME FALSE) |