diff options
| author | Alex Neundorf <neundorf@kde.org> | 2013-04-10 19:18:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-15 13:06:21 (GMT) |
| commit | efb19b6d45a69ff4c1fac40486a32c4bba5b8739 (patch) | |
| tree | 96465c97e2983700262b072b2553a9387a6da00c /Modules/CMakeSystem.cmake.in | |
| parent | a96452ec066933974518acf015e9494f3b0834c5 (diff) | |
| download | CMake-efb19b6d45a69ff4c1fac40486a32c4bba5b8739.zip CMake-efb19b6d45a69ff4c1fac40486a32c4bba5b8739.tar.gz CMake-efb19b6d45a69ff4c1fac40486a32c4bba5b8739.tar.bz2 | |
CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)
Make the CMAKE_HOST_* variables always available in the toolchain file.
They are when the file is included in CMakeDetermineSystem.cmake, and
now also here. For the non-cross-compiling case this does not change
anything at all.
Alex
Diffstat (limited to 'Modules/CMakeSystem.cmake.in')
| -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) |