mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17

Browse Source 
Make room for a new case for clang-cl 18.
This commit is contained in:
Brad King
2024-02-07 09:29:22 -05:00
parent 5e984bb352
commit a88acb0a41
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/Ninja/RunCMakeTest.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ if(WIN32)
if(RunCMake_MAKE_PROGRAM) if(RunCMake_MAKE_PROGRAM)
set(maybe_MAKE_PROGRAM "-DRunCMake_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") set(maybe_MAKE_PROGRAM "-DRunCMake_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}")
endif() endif()
run_cmake_script(ShowIncludes-437-ClangCl -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-ClangCl-17 -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
run_cmake_script(ShowIncludes-437-English -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-English -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
run_cmake_script(ShowIncludes-437-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
run_cmake_script(ShowIncludes-437-German -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-German -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake → Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake
+1 -1
View File
@@ -1,3 +1,3 @@
# 'clang-cl /showIncludes' prefix. # 'clang-cl /showIncludes' prefix for clang-cl <= 17.
set(expect "Note: including file: ") set(expect "Note: including file: ")
include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake) include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake)
Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt → Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt
View File
Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake → Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake
+1 -1
View File
@@ -1,3 +1,3 @@
set(CODEPAGE 437) set(CODEPAGE 437)
set(VSLANG "clang-cl") # Special case for test, not a real VS value. set(VSLANG "clang-cl-17") # Special case for test, not a real VS value.
include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake) include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake)
Tests/RunCMake/showIncludes.c
+2 -2
View File
@@ -28,8 +28,8 @@ int main()
printf("OEM code page: %u\n", GetOEMCP()); printf("OEM code page: %u\n", GetOEMCP());
printf("VSLANG: %s\n", vslang); printf("VSLANG: %s\n", vslang);
// clang-cl (special case for test, not a real VS value). // clang-cl <= 17 (special case for test, not a real VS value).
if (strcmp(vslang, "clang-cl") == 0) { if (strcmp(vslang, "clang-cl-17") == 0) {
if (cp == 437 || cp == 65001) { if (cp == 437 || cp == 65001) {
printf("Note: including file: ./foo.h\n"); printf("Note: including file: ./foo.h\n");
return 0; return 0;