diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:36:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:36:39 (GMT) |
| commit | 0d217e64d02e8f56a720097925da8edb497c4c9d (patch) | |
| tree | f033985a888d7ea3d0b44d0ca217c3e9cc2bf4dc /Modules | |
| parent | 5c2084b74b28f6b0e5a243a972c34f6d770f842c (diff) | |
| parent | efb19b6d45a69ff4c1fac40486a32c4bba5b8739 (diff) | |
| download | CMake-0d217e64d02e8f56a720097925da8edb497c4c9d.zip CMake-0d217e64d02e8f56a720097925da8edb497c4c9d.tar.gz CMake-0d217e64d02e8f56a720097925da8edb497c4c9d.tar.bz2 | |
Merge topic 'CrossCompilingFix13796'
efb19b6 CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeSystem.cmake.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/CMakeSystem.cmake.in b/Modules/CMakeSystem.cmake.in index 7e2a358..70c98d5 100644 --- a/Modules/CMakeSystem.cmake.in +++ b/Modules/CMakeSystem.cmake.in @@ -1,3 +1,8 @@ +set(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@") +set(CMAKE_HOST_SYSTEM_NAME "@CMAKE_HOST_SYSTEM_NAME@") +set(CMAKE_HOST_SYSTEM_VERSION "@CMAKE_HOST_SYSTEM_VERSION@") +set(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@") + @INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED@ set(CMAKE_SYSTEM "@CMAKE_SYSTEM@") @@ -5,11 +10,6 @@ set(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@") set(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@") set(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@") -set(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@") -set(CMAKE_HOST_SYSTEM_NAME "@CMAKE_HOST_SYSTEM_NAME@") -set(CMAKE_HOST_SYSTEM_VERSION "@CMAKE_HOST_SYSTEM_VERSION@") -set(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@") - set(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@") set(CMAKE_SYSTEM_LOADED 1) |