feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity
Files
820b1f12bf04a5df1ac86893cecee67dcfb4a607
Catch2/include/internal/catch_clara.h

39 lines
1.2 KiB
C
Raw Normal View History

Made Clara a “Cliche” header, which will be usable independently of Catch. - This is just a first step. It still has a dependency on catch_text.h, which also needs to be made a Cliche header. - These then need their own homes on GitHub.
2014-02-10 17:20:30 +00:00
/*
* Created by Phil on 10/2/2014.
* Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*
*/
#ifndef TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
New version of Clara. - updated command line setup with new API - updated STITCH macros - force embedded Clara to use Catch’s console width (but restore it after) - remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
// Use Catch's value for console width (store Clara's off to the side, if present)
#ifdef CLARA_CONFIG_CONSOLE_WIDTH
Updated version of Clara (should fix Windows compile issues) - embedded using new embed script
2017-06-20 18:03:37 +01:00
#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
New version of Clara. - updated command line setup with new API - updated STITCH macros - force embedded Clara to use Catch’s console width (but restore it after) - remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
#endif
Replaced some uses of tbc_text_format with TextFlow (from Clara)
2017-07-18 20:27:42 +01:00
#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
Extracted stand-alone micro-library, tbc_text_format.h, from catch_text.h. - use this version in clara.h so clara can stand alone.
2014-02-11 06:32:56 +00:00
Sweep out some extra warnings Swept: `-Wpadded` in some places (where it caused extra size, instead of just saying "hey, we padded struct at the end to align, just as standard says") `-Wweak-vtables` everywhere (Clang) `-Wexit-time-destructors` everywhere (Clang) `-Wmissing-noreturn` everywhere (Clang) The last three are enabled for Clang compilation going forward. Also enabled `-Wunreachable-code` for Clang and GCC
2017-09-07 16:51:33 +02:00
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-vtables"
#pragma clang diagnostic ignored "-Wexit-time-destructors"
#pragma clang diagnostic ignored "-Wshadow"
#endif
Extracted stand-alone micro-library, tbc_text_format.h, from catch_text.h. - use this version in clara.h so clara can stand alone.
2014-02-11 06:32:56 +00:00
Integrated (all) new version of Clara
2017-06-12 23:04:24 +01:00
#include "../external/clara.hpp"
New version of Clara. - updated command line setup with new API - updated STITCH macros - force embedded Clara to use Catch’s console width (but restore it after) - remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
Sweep out some extra warnings Swept: `-Wpadded` in some places (where it caused extra size, instead of just saying "hey, we padded struct at the end to align, just as standard says") `-Wweak-vtables` everywhere (Clang) `-Wexit-time-destructors` everywhere (Clang) `-Wmissing-noreturn` everywhere (Clang) The last three are enabled for Clang compilation going forward. Also enabled `-Wunreachable-code` for Clang and GCC
2017-09-07 16:51:33 +02:00
#ifdef __clang__
#pragma clang diagnostic pop
#endif
New version of Clara. - updated command line setup with new API - updated STITCH macros - force embedded Clara to use Catch’s console width (but restore it after) - remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
// Restore Clara's value for console width, if present
#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
Updated version of Clara (should fix Windows compile issues) - embedded using new embed script
2017-06-20 18:03:37 +01:00
#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
New version of Clara. - updated command line setup with new API - updated STITCH macros - force embedded Clara to use Catch’s console width (but restore it after) - remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
#endif
Made Clara a “Cliche” header, which will be usable independently of Catch. - This is just a first step. It still has a dependency on catch_text.h, which also needs to be made a Cliche header. - These then need their own homes on GitHub.
2014-02-10 17:20:30 +00:00
#endif // TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
Copy Permalink