@@ -124,16 +124,6 @@ jobs:
124
124
run : |
125
125
choco install -y -f visualstudio2022buildtools --version=117.11.4 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/390666095_1317821361/channel"
126
126
choco install visualstudio2022-workload-vctools -y
127
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools"
128
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC"
129
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools"
130
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC"
131
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120"
132
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin"
133
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64"
134
- ls "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64\\x64"
135
-
136
- - uses : lukka/get-cmake@latest
137
127
138
128
- name : Enable Windows compiler commands
139
129
if : matrix.os == 'windows'
@@ -145,42 +135,20 @@ jobs:
145
135
export-path-to-vcvarsall : ' VSVARS_ALL_PATH'
146
136
export-path-to-vs : ' VISUAL_STUDIO_PATH'
147
137
148
- - name : Print VS Variables
149
- if : matrix.os == 'windows'
150
- run : |
151
- echo "$VSVARS_ALL_PATH"
152
- echo "$VISUAL_STUDIO_PATH"
153
- ls "$VSVARS_ALL_PATH"
154
-
155
- - name : Prepend to path
156
- run : |
157
- echo -e "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64\\x64\n$(cat $GITHUB_PATH)" > $GITHUB_PATH
158
-
159
138
- name : CMake compile
160
139
if : inputs.job_type != 'build-python-wheels'
161
140
# We are pinning the version to 10.6 because >= 10.7, use node20 which is not supported in the container
162
141
163
- env :
164
- CXX : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
165
- CC : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
166
- CMAKE_CXX_COMPILER : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
167
- CMAKE_C_COMPILER : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
168
142
with :
169
143
cmakeListsTxtPath : ${{github.workspace}}/cpp/CMakeLists.txt
170
144
configurePreset : ${{env.ARCTIC_CMAKE_PRESET}}
171
- configurePresetAdditionalArgs : " ['-DVCPKG_INSTALL_OPTIONS=--clean-after-build', '-DCMAKE_CXX_COMPILER= \" C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/VC/Tools/MSVC/14.41.34120/bin/Hostx64/x64/cl.exe \" ', '-DVCPKG_PLATFORM_TOOLSET_VERSION= \" 14.41 \" ' ]"
145
+ configurePresetAdditionalArgs : " ['-DVCPKG_INSTALL_OPTIONS=--clean-after-build']"
172
146
buildPreset : ${{env.ARCTIC_CMAKE_PRESET}}
173
147
174
148
- name : CMake compile
175
149
if : inputs.job_type == 'build-python-wheels'
176
- env :
177
- CXX : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
178
- CC : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
179
- CMAKE_CXX_COMPILER : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
180
- CMAKE_C_COMPILER : " C:\\ Program Files (x86)\\ Microsoft Visual Studio\\ 2022\\ BuildTools\\ VC\\ Tools\\ MSVC\\ 14.41.34120\\ bin\\ Hostx64\\ x64\\ cl.exe"
181
150
working-directory : ${{github.workspace}}/cpp
182
151
run : |
183
- "./vcpkg/bootstrap-vcpkg.bat"
184
152
"$VSVARS_ALL_PATH/vcvars64.bat"
185
153
cmake --preset ${{env.ARCTIC_CMAKE_PRESET}} -DCMAKE_CXX_COMPILER="${{env.CXX}}"
186
154
0 commit comments