Centralize compiler detection for GCC, clang, MSVC and MINGW32. #2410
Conversation
Codecov Report
@@ Coverage Diff @@
## devel #2410 +/- ##
=======================================
Coverage 91.10% 91.10%
=======================================
Files 157 157
Lines 7414 7414
=======================================
Hits 6754 6754
Misses 660 660 |
|
Some includes should be removed before merging. :| |
|
Some lines missing while renaming macro from |
| #ifndef CATCH_COMPILER_DETECTIONS_HPP_INCLUDED | ||
| #define CATCH_COMPILER_DETECTIONS_HPP_INCLUDED | ||
|
|
||
| #if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) |
There was a problem hiding this comment.
This approach isn't going to scale well, as pretty much every new or obscure compiler masquerades for GCC, so this line is going to keep getting longer and longer.
Instead, let's have a macro CATCH_COMPILER_DETECTED, that get's set when a compiler was picked. This would simplify GCC (and also clang) to something like
#if defined(__GNUC__) and !defined(CATCH_COMPILER_DETECTED)
#define CATCH_COMPILER_GCC
#endif
| #define CATCH_COMPILER_GCC | ||
| #endif | ||
|
|
||
| #if defined(__clang__) |
There was a problem hiding this comment.
This definitely doesn't filter out all the different compilers that like to pretend they are Clang, e.g. IBM XL. See above for a good way to fix this.
|
I think this PR is currently trying to do too much. I'd recommend starting by merging the reworked compiler detection macros and the code can be converted to use them iteratively later on. |
| @@ -223,12 +225,12 @@ TEST_CASE( "Comparisons with int literals don't warn when mixing signed/ unsigne | |||
| // Disable warnings about sign conversions for the next two tests | |||
| // (as we are deliberately invoking them) | |||
| // - Currently only disabled for GCC/ LLVM. Should add VC++ too | |||
| #ifdef __GNUC__ | |||
There was a problem hiding this comment.
This line means if compiler is GNUC or clang.
But I just replaced it by CATCH_COMPILER_GCC cuases compiler warning -> error.
I'm searching for this situations in code.
Description
Macros detecting compilers
GCC,clang,MSVCandMINGW32added tocatch_compiler_capabilities.hpp.New macros are replaced with former conditions that detect the compiler.
If detecting compilers needs more conditions we can just change macros
at
catch_compiler_capabilities.hppinstead of multi places in code.GitHub Issues
Closes #2094