Skip to content

Commit 1e7a6eb

Browse files
committed
feat[msvc] manage vs2022 (14.3) and conan profile (193, 194)
1 parent 4163c6f commit 1e7a6eb

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

remaken_arch_define.pri

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,26 @@ isEmpty(REMAKEN_TARGET_PLATFORM) {
210210
}
211211
greaterThan(QMAKE_MSC_VER, 1930) {
212212
# Visual Studio 2022 (14.x with x >= 30) / Visual C++ 19.30 and up
213-
# Note : msvc version set to 14.1 - TODO change to 14.30??
214-
REMAKEN_COMPILER_VER = 14.1
213+
# Note : msvc version set to 14.3
214+
REMAKEN_COMPILER_VER = 14.3
215215
equals(CONAN_MAJOR_VERSION,1) {
216216
CONAN_WIN_COMPILER_VERSION = 17
217217
}
218218
else {
219219
CONAN_WIN_COMPILER_VERSION = 193
220220
}
221221
}
222+
greaterThan(QMAKE_MSC_VER, 1939) {
223+
# Visual Studio 2022 (14.x with x >= 40) / Visual C++ 19.40 and up
224+
# Note : msvc version set to 14.3
225+
REMAKEN_COMPILER_VER = 14.3
226+
equals(CONAN_MAJOR_VERSION,1) {
227+
CONAN_WIN_COMPILER_VERSION = 17
228+
}
229+
else {
230+
CONAN_WIN_COMPILER_VERSION = 194
231+
}
232+
}
222233
}
223234
contains(CONFIG,c++14)|contains(CONFIG,c++1z)|contains(CONFIG,c++17)|contains(CONFIG,c++2a)|contains(CONFIG,c++20) {
224235
contains(CONFIG,c++11) {

0 commit comments

Comments
 (0)