3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-02 13:25:41 +02: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
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/scripts/checkConvenienceHeaders.py
View File

@@ -120,7 +120,8 @@ def verify_convenience_header(folder):
# 4) Are all required headers present?
file_incs_set = set(file_incs)
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
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:
cpp.write(formatted_file_header(Version()))
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:
concatenate_file(cpp, file, False)
print('Concatenated {} cpp files'.format(len(cpp_files)))