diff options
author | Brad King <brad.king@kitware.com> | 2023-03-21 12:57:27 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-21 08:57:35 -0400 |
commit | 2cdb0bae28601d103d465bc92e527f1caed06bce (patch) | |
tree | 019c3d4531f739de17775a28913774ae2a923b24 /Tests | |
parent | 3bab70b5ab778237d43279c5973257efe950a5fd (diff) | |
parent | 843fc607de7654bd24eab1b6d97d69ee989a8f9c (diff) | |
download | cmake-2cdb0bae28601d103d465bc92e527f1caed06bce.tar.gz |
Merge topic 'clang-cl-showIncludes'
843fc607de Ninja: Restore detection of clang-cl showIncludes prefix
3346570ae9 Tests: Comment RunCMake.Ninja ShowIncludes sample input languages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8344
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 1 | ||||
-rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake | 3 | ||||
-rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt | 1 | ||||
-rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake | 3 | ||||
-rw-r--r-- | Tests/RunCMake/showIncludes.c | 14 |
5 files changed, 22 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index 91c48c6b47..619e94a234 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -46,6 +46,7 @@ if(WIN32) if(RunCMake_MAKE_PROGRAM) set(maybe_MAKE_PROGRAM "-DRunCMake_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") endif() + run_cmake_script(ShowIncludes-437-ClangCl -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-German -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake new file mode 100644 index 0000000000..6136463b6c --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake @@ -0,0 +1,3 @@ +# 'clang-cl /showIncludes' prefix. +set(expect "Note: including file: ") +include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt new file mode 100644 index 0000000000..bda7eaba1f --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt @@ -0,0 +1 @@ +-- showIncludes='Note: including file: ' diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake new file mode 100644 index 0000000000..7eca3d3050 --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake @@ -0,0 +1,3 @@ +set(CODEPAGE 437) +set(VSLANG "clang-cl") # Special case for test, not a real VS value. +include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake) diff --git a/Tests/RunCMake/showIncludes.c b/Tests/RunCMake/showIncludes.c index 4ea2bccdb2..5afe04a03c 100644 --- a/Tests/RunCMake/showIncludes.c +++ b/Tests/RunCMake/showIncludes.c @@ -28,6 +28,15 @@ int main() printf("OEM code page: %u\n", GetOEMCP()); printf("VSLANG: %s\n", vslang); + // clang-cl (special case for test, not a real VS value). + if (strcmp(vslang, "clang-cl") == 0) { + if (cp == 437 || cp == 65001) { + printf("Note: including file: ./foo.h\n"); + return 0; + } + } + + // German. if (strcmp(vslang, "1031") == 0) { if (cp == 437 || cp == 65001) { printf("Hinweis: Einlesen der Datei: C:\\foo.h\n"); @@ -35,6 +44,7 @@ int main() } } + // English. if (strcmp(vslang, "1033") == 0) { if (cp == 437 || cp == 65001) { printf("Note: including file: C:\\foo.h\n"); @@ -42,6 +52,7 @@ int main() } } + // French. if (strcmp(vslang, "1036") == 0) { if (cp == 437 || cp == 863) { printf("Remarque\xff: inclusion du fichier\xff: C:\\foo.h\n"); @@ -53,6 +64,7 @@ int main() } } + // Italian. if (strcmp(vslang, "1040") == 0) { if (cp == 437 || cp == 65001) { printf("Nota: file incluso C:\\foo.h\n"); @@ -60,6 +72,7 @@ int main() } } + // Japanese. if (strcmp(vslang, "1041") == 0) { if (cp == 932) { printf("\x83\x81\x83\x82: " @@ -75,6 +88,7 @@ int main() } } + // Chinese. if (strcmp(vslang, "2052") == 0) { if (cp == 54936 || cp == 936) { printf("\xd7\xa2\xd2\xe2: " |