diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-02 17:29:36 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-02 17:29:36 (GMT) |
| commit | 930bb0cd37ca9d4e522411e06defbc3c52ba8724 (patch) | |
| tree | 390aca924bea0092032182595a8be268da7a5fa6 /Tests | |
| parent | 3c1c3358005ebfb1afc8b97a3356d99a9f5cf7fd (diff) | |
| download | CMake-930bb0cd37ca9d4e522411e06defbc3c52ba8724.zip CMake-930bb0cd37ca9d4e522411e06defbc3c52ba8724.tar.gz CMake-930bb0cd37ca9d4e522411e06defbc3c52ba8724.tar.bz2 | |
ENH: remove support for presetting CMAKE_SYSTEM_INFO_FILE,
CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE, CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE,
CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE and CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE
Instead of presetting these variables to arbitrary filenames, users should
set up CMAKE_SYSTEM_NAME and the compilers correctly and also create a
Platform/ directory so these files will all follow the official cmake style,
which should make it easier to understand and debug project which have their
own platform/toolchain support files.
-remove support for a suffix to MS crosscompilers, since this is not (yet)
supported by cmake and might confuse users
Alex
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeTests/DummyToolchain.cmake | 2 | ||||
| -rw-r--r-- | Tests/CMakeTests/ToolchainTest.cmake.in | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Tests/CMakeTests/DummyToolchain.cmake b/Tests/CMakeTests/DummyToolchain.cmake index 0cd0dfb..6a60201 100644 --- a/Tests/CMakeTests/DummyToolchain.cmake +++ b/Tests/CMakeTests/DummyToolchain.cmake @@ -4,5 +4,5 @@ set(CMAKE_SYSTEM_VERSION "1.0") set(CMAKE_C_COMPILER /opt/foo/bin/arm-elf-gcc) set(CMAKE_C_OUTPUT_EXTENSION ".foo") -set(CMAKE_CXX_COMPILER /opt/bar/bin/clarm.exe) +set(CMAKE_CXX_COMPILER /opt/bar/bin/cl.exe) set(CMAKE_CXX_OUTPUT_EXTENSION ".bar") diff --git a/Tests/CMakeTests/ToolchainTest.cmake.in b/Tests/CMakeTests/ToolchainTest.cmake.in index bf0f1c2..90c45d0 100644 --- a/Tests/CMakeTests/ToolchainTest.cmake.in +++ b/Tests/CMakeTests/ToolchainTest.cmake.in @@ -121,10 +121,6 @@ endif(NOT "${CMAKE_C_OUTPUT_EXTENSION}" STREQUAL ".foo") # check the results from DetermineCXXCompiler -if(NOT "${_CMAKE_TOOLCHAIN_SUFFIX}" STREQUAL "arm") - message(FATAL_ERROR "wrong toolchain suffix detected: \"${_CMAKE_TOOLCHAIN_SUFFIX}\", expected: \"arm\"") -endif(NOT "${_CMAKE_TOOLCHAIN_SUFFIX}" STREQUAL "arm") - if(NOT "${_CMAKE_USER_CXX_COMPILER_PATH}" STREQUAL "/opt/bar/bin") message(FATAL_ERROR "wrong CXX compiler location detected: \"${_CMAKE_USER_CXX_COMPILER_PATH}\", expected: \"/opt/bar/bin\"") endif(NOT "${_CMAKE_USER_CXX_COMPILER_PATH}" STREQUAL "/opt/bar/bin") @@ -134,7 +130,6 @@ if(NOT "${CMAKE_CXX_OUTPUT_EXTENSION}" STREQUAL ".bar") endif(NOT "${CMAKE_CXX_OUTPUT_EXTENSION}" STREQUAL ".bar") message(STATUS "CMAKE_SYSTEM: \"${CMAKE_SYSTEM}\"") -message(STATUS "_CMAKE_TOOLCHAIN_SUFFIX: \"${_CMAKE_TOOLCHAIN_SUFFIX}\"") message(STATUS "_CMAKE_TOOLCHAIN_PREFIX: \"${_CMAKE_TOOLCHAIN_PREFIX}\"") message(STATUS "_CMAKE_USER_C_COMPILER_PATH: \"${_CMAKE_USER_C_COMPILER_PATH}\"") message(STATUS "_CMAKE_USER_CXX_COMPILER_PATH: \"${_CMAKE_USER_CXX_COMPILER_PATH}\"") |