From 23f451bb33c384d19ec29934b2811e081ff3e685 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 23 Apr 2014 12:10:04 +0200 Subject: CompilerId: Guard the platform-default compiler code with a parameter. --- Modules/CMakeCompilerIdDetection.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Modules/CMakeCompilerIdDetection.cmake') diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake index 4316c41610..13e420c173 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -38,7 +38,7 @@ function(compiler_id_detection outvar lang) _readFile(${file}) endforeach() - set(options ID_STRING VERSION_STRINGS ID_DEFINE) + set(options ID_STRING VERSION_STRINGS ID_DEFINE PLATFORM_DEFAULT_COMPILER) cmake_parse_arguments(CID "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if (CID_UNPARSED_ARGUMENTS) message(FATAL_ERROR "Unrecognized arguments: \"${CID_UNPARSED_ARGUMENTS}\"") @@ -103,7 +103,8 @@ function(compiler_id_detection outvar lang) set(pp_if "#elif") endforeach() - set(platform_compiler_detection " + if (CID_PLATFORM_DEFAULT_COMPILER) + set(platform_compiler_detection " /* These compilers are either not known or too old to define an identification macro. Try to identify the platform and guess that it is the native compiler. */ @@ -114,11 +115,10 @@ function(compiler_id_detection outvar lang) # define COMPILER_ID \"HP\" #else /* unknown compiler */ -# define COMPILER_ID \"\" - -#endif") +# define COMPILER_ID \"\"") + endif() - set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${platform_compiler_detection}") + set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${platform_compiler_detection}\n#endif") endif() set(${outvar} ${CMAKE_${lang}_COMPILER_ID_CONTENT} PARENT_SCOPE) -- cgit v1.2.1