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 /Modules/CMakeDetermineCXXCompiler.cmake | |
| 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 'Modules/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index d67a0f5..1efbc65 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -7,9 +7,6 @@ # as a default compiler # If the internal cmake variable _CMAKE_TOOLCHAIN_PREFIX is set, this is used # as prefix for the tools (e.g. arm-elf-g++, arm-elf-ar etc.) -# It also tries to detect a MS crosscompiler and find out its -# suffix (clarm.exe), which will be stored in _CMAKE_TOOLCHAIN_SUFFIX and -# reused for the C compiler. # # Sets the following variables: # CMAKE_CXX_COMPILER @@ -19,7 +16,6 @@ # # If not already set before, it also sets # _CMAKE_TOOLCHAIN_PREFIX -# _CMAKE_TOOLCHAIN_SUFFIX IF(NOT CMAKE_CXX_COMPILER) SET(CMAKE_CXX_COMPILER_INIT NOTFOUND) @@ -46,7 +42,7 @@ IF(NOT CMAKE_CXX_COMPILER) IF(CMAKE_CXX_COMPILER_INIT) SET(CMAKE_CXX_COMPILER_LIST ${CMAKE_CXX_COMPILER_INIT}) ELSE(CMAKE_CXX_COMPILER_INIT) - SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl${_CMAKE_TOOLCHAIN_SUFFIX} bcc xlC) + SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC) ENDIF(CMAKE_CXX_COMPILER_INIT) # Find the compiler. @@ -93,16 +89,6 @@ IF (NOT _CMAKE_TOOLCHAIN_PREFIX) ENDIF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+") ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX) -# if we have a MS cross compiler, it usually has a suffix, like -# e.g. clarm.exe or clmips.exe. Use this suffix for the CXX compiler too. -IF (NOT _CMAKE_TOOLCHAIN_SUFFIX) - GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME) - IF (COMPILER_BASENAME MATCHES "^cl(.+)\\.exe$") - STRING(REGEX REPLACE "^cl(.+)\\.exe$" "\\1" _CMAKE_TOOLCHAIN_SUFFIX "${COMPILER_BASENAME}") - ENDIF (COMPILER_BASENAME MATCHES "^cl(.+)\\.exe$") -ENDIF (NOT _CMAKE_TOOLCHAIN_SUFFIX) - - # This block was used before the compiler was identified by building a # source file. Unless g++ crashes when building a small C++ # executable this should no longer be needed. |