diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-06-26 11:27:16 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-06-26 11:29:36 +0200 |
| commit | 05b2d9fe076233961ebf24e74d47c57cc0618bbb (patch) | |
| tree | a4111281364e23cc0d6fc98b0a8f2c15965bd3c6 | |
| parent | 460c6c724850f6bf1153000b060189332ebbdb35 (diff) | |
build: Bump default `PlatformToolset` for Visual Studio 2022
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | build_msvc/README.md | 2 | ||||
| -rwxr-xr-x | build_msvc/msvc-autogen.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1b1e29ef17..ed10ef5455 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -180,7 +180,7 @@ task: - '%x64_NATIVE_TOOLS%' - cd %CIRRUS_WORKING_DIR% - ccache --zero-stats --max-size=%CCACHE_SIZE% - - python build_msvc\msvc-autogen.py -toolset v143 + - python build_msvc\msvc-autogen.py - msbuild build_msvc\bitcoin.sln -property:CLToolExe=%WRAPPED_CL% -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo - ccache --show-stats unit_tests_script: diff --git a/build_msvc/README.md b/build_msvc/README.md index 3a27fa2f5d..d59942cb17 100644 --- a/build_msvc/README.md +++ b/build_msvc/README.md @@ -50,7 +50,7 @@ Building 1. Use Python to generate `*.vcxproj` for the Visual Studio 2022 toolchain from Makefile: ```cmd -python build_msvc\msvc-autogen.py -toolset v143 +python build_msvc\msvc-autogen.py ``` 2. An optional step is to adjust the settings in the `build_msvc` directory and the `common.init.vcxproj` file. This project file contains settings that are common to all projects such as the runtime library version and target Windows SDK version. The Qt directories can also be set. To specify a non-default path to a static Qt package directory, use the `QTBASEDIR` environment variable. diff --git a/build_msvc/msvc-autogen.py b/build_msvc/msvc-autogen.py index 819fe1b7ae..c4ea598aa0 100755 --- a/build_msvc/msvc-autogen.py +++ b/build_msvc/msvc-autogen.py @@ -9,7 +9,7 @@ import argparse from shutil import copyfile SOURCE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')) -DEFAULT_PLATFORM_TOOLSET = R'v142' +DEFAULT_PLATFORM_TOOLSET = R'v143' libs = [ 'libbitcoin_cli', @@ -93,7 +93,7 @@ def set_properties(vcxproj_filename, placeholder, content): def main(): parser = argparse.ArgumentParser(description='Bitcoin-core msbuild configuration initialiser.') parser.add_argument('-toolset', nargs='?', default=DEFAULT_PLATFORM_TOOLSET, - help='Optionally sets the msbuild platform toolset, e.g. v142 for Visual Studio 2019.' + help='Optionally sets the msbuild platform toolset, e.g. v142 for Visual Studio 2019, or v143 for Visual Studio 2022.' ' default is %s.'%DEFAULT_PLATFORM_TOOLSET) args = parser.parse_args() set_properties(os.path.join(SOURCE_DIR, '../build_msvc/common.init.vcxproj'), '@TOOLSET@', args.toolset) |