Skip to content

Commit 6ff561a

Browse files
committed
Add support for Visual Studio 2026
1 parent acb6815 commit 6ff561a

8 files changed

Lines changed: 94 additions & 2 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
- CC: vs2022
2828
CXX: vs2022
2929
os: windows-2022
30+
- CC: vs2026
31+
CXX: vs2026
32+
os: windows-2025
3033
runs-on: ${{ matrix.os }}
3134
name: ${{ matrix.os }} ${{ matrix.CXX }}
3235
env:

.github/workflows/windows.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,22 @@ jobs:
8484
vcpkgarch: x64-windows
8585
vcpkglibdir: lib
8686
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
87+
- name: VS2026Debug64
88+
vmimage: windows-2025
89+
mpctype: vs2026
90+
BuildPlatform: x64
91+
BuildConfiguration: Debug
92+
vcpkgarch: x64-windows
93+
vcpkglibdir: debug/lib
94+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
95+
- name: VS2026Release64
96+
vmimage: windows-2025
97+
mpctype: vs2026
98+
BuildPlatform: x64
99+
BuildConfiguration: Release
100+
vcpkgarch: x64-windows
101+
vcpkglibdir: lib
102+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
87103
runs-on: ${{ matrix.vmimage }}
88104
name: ${{ matrix.name }}
89105
env:

ACE/NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ USER VISIBLE CHANGES BETWEEN ACE-8.0.6 and ACE-8.0.7
44
USER VISIBLE CHANGES BETWEEN ACE-8.0.5 and ACE-8.0.6
55
====================================================
66

7+
. Added support for Visual Studio 2026
8+
79
. Support floating-point-based `std::chrono::duration` in `ACE_Time_Value`
810

911
. Don't disable inlining in a debug build with Embarcadero C++ Builder compilers

ACE/ace/config-win32-msvc-145.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* -*- C++ -*- */
2+
//=============================================================================
3+
/**
4+
* @file config-win32-msvc-145.h
5+
*
6+
* @brief Microsoft Visual C++ 14.5 configuration file.
7+
*
8+
* This file is the ACE configuration file for Microsoft Visual C++ 14.5 (as released with Visual Studio 2026).
9+
*
10+
* @note Do not include this file directly, include config-win32.h instead.
11+
*/
12+
//=============================================================================
13+
14+
#ifndef ACE_CONFIG_WIN32_MSVC_145_H
15+
#define ACE_CONFIG_WIN32_MSVC_145_H
16+
#include /**/ "ace/pre.h"
17+
18+
#ifndef ACE_CONFIG_WIN32_H
19+
#error Use config-win32.h in config.h instead of this header
20+
#endif /* ACE_CONFIG_WIN32_H */
21+
22+
#ifndef ACE_WIN32_VC145
23+
# define ACE_WIN32_VC145
24+
#endif
25+
26+
#include "ace/config-win32-msvc-143.h"
27+
28+
#include /**/ "ace/post.h"
29+
#endif /* ACE_CONFIG_WIN32_MSVC_145_H */

ACE/ace/config-win32-msvc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
3434

3535
//FUZZ: disable check_for_msc_ver
36-
#if (_MSC_VER >= 1930)
36+
#if (_MSC_VER >= 1950)
37+
# include "ace/config-win32-msvc-145.h"
38+
#elif (_MSC_VER >= 1930)
3739
# include "ace/config-win32-msvc-143.h"
3840
#elif (_MSC_VER >= 1920)
3941
# include "ace/config-win32-msvc-142.h"

ACE/bin/MakeProjectCreator/config/acedefaults.mpb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ feature(!threads) {
6060
}
6161

6262
feature(ace_languagestandard2017) {
63-
specific(vs2017,vs2019,vs2022) {
63+
specific(vs2017,vs2019,vs2022,vs2026) {
6464
LanguageStandard = stdcpp17
6565
}
6666
specific(cmake) {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ssl=0
2+
qos=1
3+
rwho=0
4+
sctp=0
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// -*- MPC -*-
2+
feature (nmake_avoid_Wp64) {
3+
specific(nmake) {
4+
add_compile -= /Wp64
5+
}
6+
}
7+
8+
feature (nmake_avoid_Gm) {
9+
specific(nmake) {
10+
compile_flags -= /Gm
11+
}
12+
}
13+
14+
feature(vc_avoid_hides_local_declaration) {
15+
specific(nmake) {
16+
DisableSpecificWarnings += 4456
17+
}
18+
}
19+
20+
feature(vc_avoid_hides_global_declaration) {
21+
specific(nmake) {
22+
DisableSpecificWarnings += 4459
23+
}
24+
}
25+
26+
feature(vc_avoid_hides_class_member) {
27+
specific(nmake) {
28+
DisableSpecificWarnings += 4458
29+
}
30+
}
31+
32+
feature(ace_languagestandard2017) {
33+
specific(nmake) {
34+
compile_flags += /std:c++17
35+
}
36+
}

0 commit comments

Comments
 (0)