Skip to content

Commit 7ee0938

Browse files
committed
VS 2026 support
Note: CI is not yet ready (soon to be supported on GHA)
1 parent 97dd84b commit 7ee0938

4 files changed

Lines changed: 6 additions & 12 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ set_target_properties(_iris_x4_cxx_common PROPERTIES CXX_EXTENSIONS OFF)
4444
# Create the main X4 target
4545

4646
if(MSVC)
47+
# This needs to be `OBJECT` target to set correct `/std:` flags on IDE
4748
add_library(iris_x4 OBJECT EXCLUDE_FROM_ALL)
49+
set_target_properties(iris_x4 PROPERTIES LINKER_LANGUAGE CXX)
50+
4851
target_sources(
4952
iris_x4
5053
PRIVATE
51-
# required for determining correct `/std:` flag
52-
"${PROJECT_SOURCE_DIR}/test/dummy.cpp"
53-
5454
# "${PROJECT_SOURCE_DIR}/cpp.hint" # TODO
5555
# "${PROJECT_SOURCE_DIR}/iris_x4.natvis" # TODO
5656
)
57+
5758
else()
5859
add_library(iris_x4 INTERFACE)
5960
endif()

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ X4 scales from quick prototypes to production parsers for DSLs, data formats, an
1111
- C++23 and C++26
1212
- GCC 14
1313
- Clang 21
14-
- MSVC 2022
14+
- MSVC 2022 and 2026
1515

1616
## How to use X4
1717

‎include/iris/config.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define IRIS_CONCAT(a, b) IRIS_CONCAT_I(a, b)
1919

2020
#if _MSC_VER
21-
# include <CodeAnalysis/CppCoreCheck/warnings.h>
21+
# include <CppCoreCheck/warnings.h>
2222
# pragma warning(default: CPPCORECHECK_LIFETIME_WARNINGS)
2323
#endif
2424

‎test/dummy.cpp‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)