3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-18 10:55:39 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

19
include/catch.hpp
View File

@@ -17,6 +17,14 @@
#pragma clang diagnostic ignored "-Wpadded"
#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_context.h"
#include "internal/catch_test_registry.hpp"
@@ -37,13 +45,18 @@
#include "internal/catch_objc.hpp"
#endif
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
#ifdef CATCH_CONFIG_RUNNER
#include "internal/catch_impl.hpp"
#endif // CATCH_CONFIG_MAIN || CATCH_CONFIG_RUNNER
#endif
#ifdef CATCH_CONFIG_MAIN
#include "internal/catch_default_main.hpp"
#endif // CATCH_CONFIG_MAIN
#endif
#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
# undef CLARA_CONFIG_MAIN
#endif
//////