Skip to content

Commit 5e8ab5e

Browse files
authored
release-windows.yml: fixed build with Visual Studio 2026 [skip ci] (#8563)
this is caused by `vs2025` now using Visual Studio 2026
1 parent bc33aee commit 5e8ab5e

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/release-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
5757
git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
5858
cmake . -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
59-
msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
59+
msbuild -m PCRE.slnx -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
6060
copy pcre.h ..\externals || exit /b !errorlevel!
6161
copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
6262

releasenotes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ Other:
2626
- Make it possible to specify the regular expression engine using the `engine` element in a rule XML.
2727
- Added CLI option `--exitcode-suppress` to specify an error ID which should not result in a non-zero exitcode.
2828
- Moved source code from https://github.com/danmar/cppcheck to https://github.com/cppcheck-opensource/cppcheck
29+
- The official Windows binary is now built with Visual Studio 2026.
2930
-

win_installer/config.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<?define AddonsDir = "files\addons" ?>
1010
<?define QtDllDir = "files" ?>
1111

12-
<?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm" ?>
12+
<?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v145\MergeModules\Microsoft_VC145_CRT_x64.msm" ?>
1313
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
1414
</Include>

0 commit comments

Comments
 (0)