diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-06-05 13:05:20 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-06-05 14:02:52 +0200 |
| commit | 78acaafebe4821f7a62f835f8ced6330097745f2 (patch) | |
| tree | 9602245fa0fd39b5642d2625e3d3c37da05d8cae /Modules/Compiler | |
| parent | 567af1a596455b096c9261317b1562ceb89f2e95 (diff) | |
| download | cmake-78acaafebe4821f7a62f835f8ced6330097745f2.tar.gz | |
Project: Separate simulated compiler id from version detection.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Clang-DetermineCompilerInternal.cmake | 6 | ||||
| -rw-r--r-- | Modules/Compiler/Intel-DetermineCompiler.cmake | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Modules/Compiler/Clang-DetermineCompilerInternal.cmake b/Modules/Compiler/Clang-DetermineCompilerInternal.cmake index 9a37a637ba..4326babb33 100644 --- a/Modules/Compiler/Clang-DetermineCompilerInternal.cmake +++ b/Modules/Compiler/Clang-DetermineCompilerInternal.cmake @@ -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") diff --git a/Modules/Compiler/Intel-DetermineCompiler.cmake b/Modules/Compiler/Intel-DetermineCompiler.cmake index 6fada1cd5f..0d4e51291c 100644 --- a/Modules/Compiler/Intel-DetermineCompiler.cmake +++ b/Modules/Compiler/Intel-DetermineCompiler.cmake @@ -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") |