Skip to content

Commit 91074f9

Browse files
firewavefirewave
committed
removed Visual Studio x86 targets from project files and builds from CI
1 parent c068c74 commit 91074f9

File tree

8 files changed

+24
-728
lines changed

8 files changed

+24
-728
lines changed

‎.github/workflows/CI-windows.yml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Visual Studio environment
4040
uses: ilammy/msvc-dev-cmd@v1
4141
with:
42-
arch: x64 # no 32-bit Qt available
42+
arch: x64
4343

4444
- name: Install Qt ${{ matrix.qt_ver }}
4545
uses: jurplel/install-qt-action@v3
@@ -76,7 +76,6 @@ jobs:
7676
strategy:
7777
matrix:
7878
os: [windows-2019, windows-2022]
79-
arch: [x64, x86]
8079
config: [debug, release]
8180
fail-fast: false
8281

@@ -99,7 +98,7 @@ jobs:
9998
- name: Set up Visual Studio environment
10099
uses: ilammy/msvc-dev-cmd@v1
101100
with:
102-
arch: ${{ matrix.arch }}
101+
arch: x64
103102

104103
- name: Cache PCRE
105104
id: cache-pcre
@@ -109,7 +108,7 @@ jobs:
109108
externals\pcre.h
110109
externals\pcre.lib
111110
externals\pcre64.lib
112-
key: pcre-${{ env.PCRE_VERSION }}-${{ matrix.arch }}-bin-win
111+
key: pcre-${{ env.PCRE_VERSION }}-x64-bin-win
113112

114113
- name: Download PCRE
115114
if: steps.cache-pcre.outputs.cache-hit != 'true'
@@ -124,11 +123,7 @@ jobs:
124123
cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off || exit /b !errorlevel!
125124
nmake || exit /b !errorlevel!
126125
copy pcre.h ..\externals || exit /b !errorlevel!
127-
if "${{ matrix.arch }}" == "x86" (
128-
copy pcre.lib ..\externals\pcre.lib || exit /b !errorlevel!
129-
) else (
130-
copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
131-
)
126+
copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
132127
env:
133128
CL: /MP
134129

@@ -143,21 +138,13 @@ jobs:
143138
- name: Run CMake
144139
if: false # TODO: enable
145140
run: |
146-
set ARCH=${{ matrix.arch }}
147-
if "${{ matrix.arch }}" == "x86" (
148-
set ARCH=Win32
149-
)
150141
cmake -S . -B build -DBUILD_TESTS=On || exit /b !errorlevel!
151142
152143
- name: Build CLI debug configuration using MSBuild
153144
if: matrix.config == 'debug'
154145
run: |
155-
set ARCH=${{ matrix.arch }}
156-
if "${{ matrix.arch }}" == "x86" (
157-
set ARCH=Win32
158-
)
159146
:: cmake --build build --target check --config Debug || exit /b !errorlevel!
160-
msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
147+
msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel!
161148
162149
- name: Run Debug test
163150
if: matrix.config == 'debug'
@@ -166,12 +153,8 @@ jobs:
166153
- name: Build CLI release configuration using MSBuild
167154
if: matrix.config == 'release'
168155
run: |
169-
set ARCH=${{ matrix.arch }}
170-
if "${{ matrix.arch }}" == "x86" (
171-
set ARCH=Win32
172-
)
173156
:: cmake --build build --target check --config Release || exit /b !errorlevel!
174-
msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
157+
msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel!
175158
176159
- name: Run Release test
177160
if: matrix.config == 'release'

‎cli/cli.vcxproj‎

Lines changed: 0 additions & 211 deletions
Large diffs are not rendered by default.

‎cppcheck.sln‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,76 +19,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dmake", "tools\dmake.vcxpro
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22-
Debug|Win32 = Debug|Win32
2322
Debug|x64 = Debug|x64
24-
Debug-PCRE|Win32 = Debug-PCRE|Win32
2523
Debug-PCRE|x64 = Debug-PCRE|x64
26-
Release|Win32 = Release|Win32
2724
Release|x64 = Release|x64
28-
Release-PCRE|Win32 = Release-PCRE|Win32
2925
Release-PCRE|x64 = Release-PCRE|x64
3026
EndGlobalSection
3127
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.ActiveCfg = Debug|Win32
33-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.Build.0 = Debug|Win32
3428
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.ActiveCfg = Debug|x64
3529
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.Build.0 = Debug|x64
36-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
37-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
3830
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
3931
{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
40-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.ActiveCfg = Release|Win32
41-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.Build.0 = Release|Win32
4232
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.ActiveCfg = Release|x64
4333
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.Build.0 = Release|x64
44-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
45-
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
4634
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
4735
{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
48-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.ActiveCfg = Debug|Win32
49-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.Build.0 = Debug|Win32
5036
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.ActiveCfg = Debug|x64
5137
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.Build.0 = Debug|x64
52-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
53-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
5438
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
5539
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
56-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.ActiveCfg = Release|Win32
57-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.Build.0 = Release|Win32
5840
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.ActiveCfg = Release|x64
5941
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.Build.0 = Release|x64
60-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
61-
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
6242
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
6343
{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
64-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.ActiveCfg = Debug|Win32
65-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.Build.0 = Debug|Win32
6644
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.ActiveCfg = Debug|x64
6745
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.Build.0 = Debug|x64
68-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
69-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
7046
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
7147
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
72-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.ActiveCfg = Release|Win32
73-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.Build.0 = Release|Win32
7448
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.ActiveCfg = Release|x64
7549
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.Build.0 = Release|x64
76-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
77-
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
7850
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
7951
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
80-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.ActiveCfg = Debug|Win32
81-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.Build.0 = Debug|Win32
82-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|Win32
83-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.ActiveCfg = Debug|Win32
84-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.Build.0 = Debug|Win32
85-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|Win32
86-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.ActiveCfg = Release|Win32
87-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.Build.0 = Release|Win32
88-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|Win32
89-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.ActiveCfg = Release|Win32
90-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.Build.0 = Release|Win32
91-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|Win32
52+
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|x64
53+
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|x64
54+
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|x64
55+
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|x64
9256
EndGlobalSection
9357
GlobalSection(SolutionProperties) = preSolution
9458
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)