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

Don't expose header windows.h in catch_all.hpp (#2526)

Browse Source 
* Don't expose header windows.h in catch_all.hpp
* Fix generateAmalgamatedFiles.py
This commit is contained in:
Dimitrij Mijoski 2022-10-03 15:36:37 +02:00 committed by GitHub
parent 4db8b50aab
commit 980c20694e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/catch2/catch_all.hpp
View File

@ -114,7 +114,6 @@
#include <catch2/internal/catch_unique_ptr.hpp> #include <catch2/internal/catch_unique_ptr.hpp>
#include <catch2/internal/catch_void_type.hpp> #include <catch2/internal/catch_void_type.hpp>
#include <catch2/internal/catch_wildcard_pattern.hpp> #include <catch2/internal/catch_wildcard_pattern.hpp>
#include <catch2/internal/catch_windows_h_proxy.hpp>
#include <catch2/internal/catch_xmlwriter.hpp> #include <catch2/internal/catch_xmlwriter.hpp>
#include <catch2/matchers/catch_matchers_all.hpp> #include <catch2/matchers/catch_matchers_all.hpp>
#include <catch2/reporters/catch_reporters_all.hpp> #include <catch2/reporters/catch_reporters_all.hpp>

4
src/catch2/internal/catch_windows_h_proxy.hpp
View File

@ -21,11 +21,7 @@
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#ifdef __AFXDLL
#include <AfxWin.h>
#else
#include <windows.h> #include <windows.h>
#endif
#endif // defined(CATCH_PLATFORM_WINDOWS) #endif // defined(CATCH_PLATFORM_WINDOWS)

3
tools/scripts/checkConvenienceHeaders.py
View File

@ -120,7 +120,8 @@ def verify_convenience_header(folder):
# 4) Are all required headers present? # 4) Are all required headers present?
file_incs_set = set(file_incs) file_incs_set = set(file_incs)
for include in target_includes: for include in target_includes:
if include not in file_incs_set: if (include not in file_incs_set and
include != 'catch2/internal/catch_windows_h_proxy.hpp'):
errors_found = True errors_found = True
print("'{}': missing include '{}'".format(header_name, include)) print("'{}': missing include '{}'".format(header_name, include))

1
tools/scripts/generateAmalgamatedFiles.py
View File

@ -108,6 +108,7 @@ def generate_cpp():
with open(output_cpp, mode='w', encoding='utf-8') as cpp: with open(output_cpp, mode='w', encoding='utf-8') as cpp:
cpp.write(formatted_file_header(Version())) cpp.write(formatted_file_header(Version()))
cpp.write('\n#include "catch_amalgamated.hpp"\n') cpp.write('\n#include "catch_amalgamated.hpp"\n')
concatenate_file(cpp, os.path.join(root_path, 'catch2/internal/catch_windows_h_proxy.hpp'), False)
for file in cpp_files: for file in cpp_files:
concatenate_file(cpp, file, False) concatenate_file(cpp, file, False)
print('Concatenated {} cpp files'.format(len(cpp_files))) print('Concatenated {} cpp files'.format(len(cpp_files)))