Commit 78acaafe authored by Stephen Kelly's avatar Stephen Kelly
Browse files

Project: Separate simulated compiler id from version detection.

parent 567af1a5
......@@ -17,6 +17,7 @@ function(_readFile file)
get_filename_component(name ${file} NAME_WE)
string(REGEX REPLACE "-.*" "" CompilerId ${name})
set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
set(_compiler_id_simulate_${CompilerId} ${_compiler_id_simulate} PARENT_SCOPE)
set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE)
endfunction()
......@@ -114,7 +115,9 @@ function(compiler_id_detection outvar lang)
endif()
set(id_content "${pp_if} ${_compiler_id_pp_test_${Id}}\n")
if (CID_ID_STRING)
set(id_content "${id_content}# define ${CID_PREFIX}COMPILER_ID \"${Id}\"")
set(PREFIX ${CID_PREFIX})
string(CONFIGURE "${_compiler_id_simulate_${Id}}" SIMULATE_BLOCK @ONLY)
set(id_content "${id_content}# define ${CID_PREFIX}COMPILER_ID \"${Id}\"${SIMULATE_BLOCK}")
endif()
if (CID_ID_DEFINE)
set(id_content "${id_content}# undef ${CID_PREFIX}COMPILER_IS_${Id}\n")
......
......@@ -4,8 +4,12 @@ set(_compiler_id_version_compute "
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__clang_minor__)
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__clang_patchlevel__)
# if defined(_MSC_VER)
# define @PREFIX@SIMULATE_ID \"MSVC\"
/* _MSC_VER = VVRR */
# define @PREFIX@SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100)
# define @PREFIX@SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100)
# endif")
set(_compiler_id_simulate "
# if defined(_MSC_VER)
# define @PREFIX@SIMULATE_ID \"MSVC\"
# endif")
......@@ -15,8 +15,12 @@ set(_compiler_id_version_compute "
# define @PREFIX@COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
# endif
# if defined(_MSC_VER)
# define @PREFIX@SIMULATE_ID \"MSVC\"
/* _MSC_VER = VVRR */
# define @PREFIX@SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100)
# define @PREFIX@SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100)
# endif")
set(_compiler_id_simulate "
# if defined(_MSC_VER)
# define @PREFIX@SIMULATE_ID \"MSVC\"
# endif")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment