diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-05 14:28:43 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-05 14:28:43 (GMT) |
| commit | eab5a4350d45fe228ad143cf481c52c26feacef3 (patch) | |
| tree | 88282dc5469f70e84600628781ada218ac9a4042 /Modules/CMakeSystemWithToolchainFile.cmake.in | |
| parent | 6989f80026498fa24134143b30adf8a909aba51d (diff) | |
| download | CMake-eab5a4350d45fe228ad143cf481c52c26feacef3.zip CMake-eab5a4350d45fe228ad143cf481c52c26feacef3.tar.gz CMake-eab5a4350d45fe228ad143cf481c52c26feacef3.tar.bz2 | |
ENH: also load a processor-specific file if exists
-also try the basename file if the compiler id file doesn't exist
-don't rely so much on the CMAKE_TOOLCHAIN_FILE
Alex
Diffstat (limited to 'Modules/CMakeSystemWithToolchainFile.cmake.in')
| -rw-r--r-- | Modules/CMakeSystemWithToolchainFile.cmake.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Modules/CMakeSystemWithToolchainFile.cmake.in b/Modules/CMakeSystemWithToolchainFile.cmake.in index cfaa037..6bf3b15 100644 --- a/Modules/CMakeSystemWithToolchainFile.cmake.in +++ b/Modules/CMakeSystemWithToolchainFile.cmake.in @@ -1,12 +1,10 @@ # the following file has been configured from @CMAKE_TOOLCHAIN_FILE@ INCLUDE(@_OWN_DIR@/CMakeToolchainFile.cmake) -# set CMAKE_SYSTEM to the CMAKE_SYSTEM_NAME -SET(CMAKE_SYSTEM ${CMAKE_SYSTEM_NAME}) -# if there is a CMAKE_SYSTEM_VERSION then add a -${CMAKE_SYSTEM_VERSION} -IF(CMAKE_SYSTEM_VERSION) - SET(CMAKE_SYSTEM ${CMAKE_SYSTEM}-${CMAKE_SYSTEM_VERSION}) -ENDIF(CMAKE_SYSTEM_VERSION) +SET(CMAKE_SYSTEM "@CMAKE_SYSTEM@") +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@") |