Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-02-02 15:36:58 +0100
committerMartin Hořeňovský2022-02-18 11:15:08 +0100
commit33ffc3b6fc1cdb2815a87476b06ff9afb2f2a6bd (patch)
tree5fbc42361fbe0ea8b847dfdfd7eb954dbfdaf777 /src/catch2/internal
parentfc5552d27b57628f8faf6064ca6b305e2d3bf458 (diff)
downloadcatch3-33ffc3b6fc1cdb2815a87476b06ff9afb2f2a6bd.tar.gz
Allow passing compile-time configuration options through CMake
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_compiler_capabilities.hpp4
-rw-r--r--src/catch2/internal/catch_config_android_logwrite.hpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp
index 0684050b..a999ebbd 100644
--- a/src/catch2/internal/catch_compiler_capabilities.hpp
+++ b/src/catch2/internal/catch_compiler_capabilities.hpp
@@ -287,7 +287,9 @@
# define CATCH_CONFIG_NEW_CAPTURE
#endif
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#if !defined( CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED ) && \
+ !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS ) && \
+ !defined( CATCH_CONFIG_NO_DISABLE_EXCEPTIONS )
# define CATCH_CONFIG_DISABLE_EXCEPTIONS
#endif
diff --git a/src/catch2/internal/catch_config_android_logwrite.hpp b/src/catch2/internal/catch_config_android_logwrite.hpp
index 199c9375..670af2d5 100644
--- a/src/catch2/internal/catch_config_android_logwrite.hpp
+++ b/src/catch2/internal/catch_config_android_logwrite.hpp
@@ -17,6 +17,8 @@
#ifndef CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
#define CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+#include <catch2/catch_user_config.hpp>
+
#if defined(__ANDROID__)
# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
#endif