diff options
author | Stephen Kelly <steveire@gmail.com> | 2014-01-20 16:57:40 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-01-22 13:47:32 (GMT) |
commit | e00db59d6c3f1c519f0f0d7a359d6d1be396b255 (patch) | |
tree | a98d312c289c5dee84daf71a02f2a78c15101d2b /Modules/CMakeCXXCompilerId.cpp.in | |
parent | d2dea79b36833412884807e96821d1e68d620b4d (diff) | |
download | CMake-e00db59d6c3f1c519f0f0d7a359d6d1be396b255.zip CMake-e00db59d6c3f1c519f0f0d7a359d6d1be396b255.tar.gz CMake-e00db59d6c3f1c519f0f0d7a359d6d1be396b255.tar.bz2 |
QNX: Introduce QCC compiler id for that QNX platform compiler.
Introduce policy CMP0047 to control resetting the id for
compatibility.
De-duplicate content in the QNX platform file by including the GNU
one. QNX is a form of GNU platform.
Do not clear CMAKE_SHARED_LIBRARY_${lang}_FLAGS variables. They
are populated again later by the Compiler/GNU.cmake file anyway.
Modify the CMAKE_CXX_COMPILE_OBJECT variable only when the QCC
compiler id is in use, and the language is CXX. Use the QNX
recommended flag for QCC instead of the gcc compatible -x flag.
Populate new module files to handle system includes and depfiles
when using the QCC compiler.
Remove code which unsets the system include and depfiles related
variables. When a GNU driver is used instead of the QCC one, the
appropriate flags will be used. These variables were previously
cleared for lowest-common-denominator compatibility with both
drivers.
Diffstat (limited to 'Modules/CMakeCXXCompilerId.cpp.in')
-rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index b5d498d..25ceb3f 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -220,6 +220,10 @@ char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; #endif +#ifdef __QNXNTO__ +char const* qnxnto = "INFO" ":" "qnxnto"; +#endif + @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_CXX_COMPILER_ID_ERROR_FOR_TEST@ |