diff options
| author | Dimitrij Mijoski | 2022-10-03 15:36:37 +0200 |
|---|---|---|
| committer | GitHub | 2022-10-03 15:36:37 +0200 |
| commit | 980c20694ecb60e3671ee3c08a53b4b720f5d4ae (patch) | |
| tree | 5df25361bc768c558ab0d69bdf8ae43f9730f815 /tools/scripts/generateAmalgamatedFiles.py | |
| parent | 4db8b50aab9f91f31b2953455091e257942ec188 (diff) | |
| download | catch3-980c20694ecb60e3671ee3c08a53b4b720f5d4ae.tar.gz | |
Don't expose header windows.h in catch_all.hpp (#2526)
* Don't expose header windows.h in catch_all.hpp
* Fix generateAmalgamatedFiles.py
Diffstat (limited to 'tools/scripts/generateAmalgamatedFiles.py')
| -rwxr-xr-x | tools/scripts/generateAmalgamatedFiles.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/scripts/generateAmalgamatedFiles.py b/tools/scripts/generateAmalgamatedFiles.py index 812712a3..172353e6 100755 --- a/tools/scripts/generateAmalgamatedFiles.py +++ b/tools/scripts/generateAmalgamatedFiles.py @@ -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))) |