diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-12 13:25:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-12 13:25:37 (GMT) |
| commit | fdc9e9e4fac27a3e754035ac9b252d6a89e19228 (patch) | |
| tree | 0d90048ce6cef159d6d6edec684201d722065b0d /Tests/CMakeLists.txt | |
| parent | f46c67de0e16293a40bbbade18aa7cee9edb02b0 (diff) | |
| parent | 834422e0752514a06c868e3ec2df190171e8affe (diff) | |
| download | CMake-fdc9e9e4fac27a3e754035ac9b252d6a89e19228.zip CMake-fdc9e9e4fac27a3e754035ac9b252d6a89e19228.tar.gz CMake-fdc9e9e4fac27a3e754035ac9b252d6a89e19228.tar.bz2 | |
Merge topic 'vs-arm64-tests'
834422e075 Tests: Fix test failures for Windows Arm64 platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7251
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9cee144..7fdfaea 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -431,8 +431,10 @@ if(BUILD_TESTING) if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])") ADD_TEST_MACRO(CSharpOnly CSharpOnly) - ADD_TEST_MACRO(CSharpLinkToCxx CSharpLinkToCxx) - ADD_TEST_MACRO(CSharpLinkFromCxx CSharpLinkFromCxx) + if(NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") + ADD_TEST_MACRO(CSharpLinkToCxx CSharpLinkToCxx) + ADD_TEST_MACRO(CSharpLinkFromCxx CSharpLinkFromCxx) + endif() ADD_TEST_MACRO(CSharpWin32GenEx CSharpWin32GenEx) set_tests_properties(CSharpWin32GenEx PROPERTIES PASS_REGULAR_EXPRESSION "Target \"CSharpWin32GenEx\" has a generator expression in its\n WIN32_EXECUTABLE property\\. This is not supported on managed executables\\." @@ -2113,6 +2115,7 @@ if(BUILD_TESTING) if(MSVC AND NOT MSVC_VERSION LESS 1310 AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio 9 " OR CMAKE_SIZEOF_VOID_P EQUAL 4) + AND (NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") ) ADD_TEST_MACRO(VSMASM VSMASM) endif() @@ -2123,7 +2126,8 @@ if(BUILD_TESTING) endif() if(NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 9 " - AND NOT CMAKE_GENERATOR_TOOLSET STREQUAL "v90") + AND NOT CMAKE_GENERATOR_TOOLSET STREQUAL "v90" + AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") ADD_TEST_MACRO(VSWindowsFormsResx VSWindowsFormsResx) ADD_TEST_MACRO(VSManagedCustomCommand) endif() |