diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-21 13:25:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-21 13:26:37 (GMT) |
| commit | 3946cbc505a066677efe1faea3cc2d051b1132bc (patch) | |
| tree | 5eed00ff43200b397718c9be0ec9dd7234416f92 /Modules | |
| parent | 948eb3b2bf450d9c1a562af9cb2f9cc188a9ec6a (diff) | |
| parent | dc863592bce3f4cda927c55a550af661a0663513 (diff) | |
| download | CMake-3946cbc505a066677efe1faea3cc2d051b1132bc.zip CMake-3946cbc505a066677efe1faea3cc2d051b1132bc.tar.gz CMake-3946cbc505a066677efe1faea3cc2d051b1132bc.tar.bz2 | |
Merge topic 'wcdh-gcc-null'
dc863592bc WCDH: use better fallback value for nullptr with old gcc versions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1877
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index e7f9912..675df84 100644 --- a/Modules/WriteCompilerDetectionHeader.cmake +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -557,7 +557,18 @@ template<> struct ${prefix_arg}StaticAssert<true>{}; # endif \n") endif() - _simpledefine(cxx_nullptr NULLPTR nullptr 0) + if (feature STREQUAL cxx_nullptr) + set(def_value "${prefix_arg}_NULLPTR") + string(APPEND file_content " +# if defined(${def_name}) && ${def_name} +# define ${def_value} nullptr +# elif ${prefix_arg}_COMPILER_IS_GNU +# define ${def_value} __null +# else +# define ${def_value} 0 +# endif +\n") + endif() if (feature STREQUAL cxx_thread_local) set(def_value "${prefix_arg}_THREAD_LOCAL") string(APPEND file_content " |