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

Separate version macros to its own header

Browse Source
This commit is contained in:
Martin Hořeňovský 2020-01-19 15:30:38 +01:00
parent ec7280379e
commit acf975cab1
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -115,6 +115,7 @@ set(INTERNAL_HEADERS
${SOURCES_DIR}/catch_uncaught_exceptions.h ${SOURCES_DIR}/catch_uncaught_exceptions.h
${SOURCES_DIR}/catch_user_interfaces.h ${SOURCES_DIR}/catch_user_interfaces.h
${SOURCES_DIR}/catch_version.h ${SOURCES_DIR}/catch_version.h
${SOURCES_DIR}/catch_version_macros.hpp
${SOURCES_DIR}/catch_wildcard_pattern.h ${SOURCES_DIR}/catch_wildcard_pattern.h
${SOURCES_DIR}/catch_windows_h_proxy.h ${SOURCES_DIR}/catch_windows_h_proxy.h
${SOURCES_DIR}/catch_xmlwriter.h ${SOURCES_DIR}/catch_xmlwriter.h

4
src/catch2/catch.hpp
View File

@ -9,9 +9,7 @@
#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_HPP_INCLUDED #define TWOBLUECUBES_CATCH_HPP_INCLUDED
#define CATCH_VERSION_MAJOR 2 #include <catch2/catch_version_macros.hpp>
#define CATCH_VERSION_MINOR 10
#define CATCH_VERSION_PATCH 2
#ifdef __clang__ #ifdef __clang__
# pragma clang system_header # pragma clang system_header

13
src/catch2/catch_version_macros.hpp Normal file
View File

@ -0,0 +1,13 @@
/*
* 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_VERSION_MACROS_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 10
#define CATCH_VERSION_PATCH 2
#endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED

2
tools/scripts/releaseCommon.py
View File

@ -12,7 +12,7 @@ from scriptCommon import catchPath
versionParser = re.compile( r'(\s*static\sVersion\sversion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' ) versionParser = re.compile( r'(\s*static\sVersion\sversion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' )
rootPath = os.path.join( catchPath, 'src/catch2' ) rootPath = os.path.join( catchPath, 'src/catch2' )
versionPath = os.path.join( rootPath, "catch_version.cpp" ) versionPath = os.path.join( rootPath, "catch_version.cpp" )
definePath = os.path.join(rootPath, 'catch.hpp') definePath = os.path.join(rootPath, 'catch_version_macros.hpp')
readmePath = os.path.join( catchPath, "README.md" ) readmePath = os.path.join( catchPath, "README.md" )
cmakePath = os.path.join(catchPath, 'CMakeLists.txt') cmakePath = os.path.join(catchPath, 'CMakeLists.txt')