Skip to content

Commit 3a3891e

Browse files
committed
[v6-36] Add support for Visual Studio 2026
1 parent adab3fc commit 3a3891e

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

cmake/modules/RootCPack.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ if(MSVC)
8181
math(EXPR VS_VERSION "${VC_MAJOR} - 3")
8282
elseif(MSVC_VERSION LESS 1950)
8383
math(EXPR VS_VERSION "${VC_MAJOR} - 2")
84+
elseif(MSVC_VERSION LESS 1960)
85+
math(EXPR VS_VERSION "${VC_MAJOR} - 1")
8486
else()
8587
message(FATAL_ERROR "MSVC_VERSION ${MSVC_VERSION} not implemented")
8688
endif()

interpreter/cling/lib/Utils/PlatformWin.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,8 @@ static int GetVisualStudioVersionCompiledWith() {
386386
return 16;
387387
#elif (_MSC_VER < 1950)
388388
return 17;
389+
#elif (_MSC_VER < 1960)
390+
return 18;
389391
#else
390392
#error "Unsupported/Untested _MSC_VER"
391393
// As of now this is what is should be...have fun!

tutorials/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,7 @@ if(ROOT_pyroot_FOUND)
938938
)
939939
file(GLOB requires_tensorflow RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
940940
machine_learning/RBatchGenerator_TensorFlow.py
941+
machine_learning/TMVA_CNN_Classification.py
941942
)
942943
set(fixtureLists
943944
requires_keras

0 commit comments

Comments
 (0)