Skip to content

[cmake][win] Fix compilation errors with /std:c++20 #20987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bellenot merged 3 commits into from
Jan 23, 2026
+1 −3
Merged

[cmake][win] Fix compilation errors with /std:c++20 #20987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85184cb
[cmake][win] Fix compilation errors with /std:c++20
bellenot Jan 22, 2026
6a350c8
[cmake][win] Fix several tests with /std:c++20
bellenot Jan 22, 2026
0f873ad
[cmake][win] Remove custom `CMAKE_CXX_FLAGS`
bellenot Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/RConfigure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define ROOT__cplusplus @__cplusplus@
#if defined(__cplusplus) && (__cplusplus != ROOT__cplusplus)
# if defined(_MSC_VER)
# pragma message("The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues. And please make sure you are using the -Zc:__cplusplus compilation flag")
# pragma message(__FILE__ ": Warning: The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues. And please make sure you are using the -Zc:__cplusplus compilation flag")
# else
# warning "The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues"
# endif
Expand Down
2 changes: 0 additions & 2 deletions roottest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ if(MSVC)
set(CMAKE_SUPPRESS_REGENERATION TRUE)
set(libsuffix .dll)
set(exesuffix .exe)
set(CMAKE_CXX_FLAGS "/nologo /Zc:__cplusplus /MD /GR /EHsc- /W3 /D_WIN32")
set(grep_cmd "findstr")

set(build_config "--config $<CONFIG>")
Expand All @@ -22,7 +21,6 @@ if(MSVC)
set(WILLFAIL_ON_WIN32 WILLFAIL)
endif()

set(CMAKE_CXX_FLAGS ${ROOT_CXX_FLAGS})
# ROOT_BINDIR is set by ROOTConfig.cmake
set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat)
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
Expand Down
Loading