3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem (hopefully) with single source definitions from Clara

Browse Source 
- define CLARA_CONFIG_MAIN in the right place
This commit is contained in:
Phil Nash 2014-03-06 21:53:34 +00:00
parent 9b4c7fa0f7
commit 9abb27676d
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 28 (master branch)* *v1.0 build 29 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

19
include/catch.hpp
View File

@ -17,6 +17,14 @@
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"
#endif #endif
#ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER
# ifndef CLARA_CONFIG_MAIN
# define CLARA_CONFIG_MAIN_NOT_DEFINED
# define CLARA_CONFIG_MAIN
# endif
#endif
#include "internal/catch_notimplemented_exception.h" #include "internal/catch_notimplemented_exception.h"
#include "internal/catch_context.h" #include "internal/catch_context.h"
#include "internal/catch_test_registry.hpp" #include "internal/catch_test_registry.hpp"
@ -37,13 +45,18 @@
#include "internal/catch_objc.hpp" #include "internal/catch_objc.hpp"
#endif #endif
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER ) #ifdef CATCH_CONFIG_RUNNER
#include "internal/catch_impl.hpp" #include "internal/catch_impl.hpp"
#endif // CATCH_CONFIG_MAIN || CATCH_CONFIG_RUNNER #endif
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
#include "internal/catch_default_main.hpp" #include "internal/catch_default_main.hpp"
#endif // CATCH_CONFIG_MAIN #endif
#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
# undef CLARA_CONFIG_MAIN
#endif
////// //////

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 28, "master" ); Version libraryVersion( 1, 0, 29, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

24
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 28 (master branch) * CATCH v1.0 build 29 (master branch)
* Generated: 2014-03-06 08:16:53.424629 * Generated: 2014-03-06 21:52:26.886365
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -21,6 +21,14 @@
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"
#endif #endif
#ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER
# ifndef CLARA_CONFIG_MAIN
# define CLARA_CONFIG_MAIN_NOT_DEFINED
# define CLARA_CONFIG_MAIN
# endif
#endif
// #included from: internal/catch_notimplemented_exception.h // #included from: internal/catch_notimplemented_exception.h
#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
@ -2645,7 +2653,7 @@ return @ desc; \
#endif #endif
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER ) #ifdef CATCH_CONFIG_RUNNER
// #included from: internal/catch_impl.hpp // #included from: internal/catch_impl.hpp
#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED #define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
@ -6580,7 +6588,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 28, "master" ); Version libraryVersion( 1, 0, 29, "master" );
} }
// #included from: catch_message.hpp // #included from: catch_message.hpp
@ -8234,7 +8242,7 @@ namespace Catch {
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#endif // CATCH_CONFIG_MAIN || CATCH_CONFIG_RUNNER #endif
#ifdef CATCH_CONFIG_MAIN #ifdef CATCH_CONFIG_MAIN
// #included from: internal/catch_default_main.hpp // #included from: internal/catch_default_main.hpp
@ -8267,7 +8275,11 @@ int main (int argc, char * const argv[]) {
#endif // __OBJC__ #endif // __OBJC__
#endif // CATCH_CONFIG_MAIN #endif
#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
# undef CLARA_CONFIG_MAIN
#endif
////// //////