diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-21 15:01:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-21 15:02:23 (GMT) |
| commit | 4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3 (patch) | |
| tree | b81f8e37657e2e9385576af1bc070342e7b71804 /Tests | |
| parent | bcdd8cfe441c45dd1c9f0617c6652eb30386e7c2 (diff) | |
| parent | b73857561fe3ffb8ee0ce3057706c51faabf2e4d (diff) | |
| download | CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.zip CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.tar.gz CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.tar.bz2 | |
Merge topic 'clang-manifest'
b73857561f Clang: embed windows manifests with GNU interface
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6534
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/MSManifest/Subdir/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/MSManifest/Subdir2/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/MSManifest/Subdir/CMakeLists.txt b/Tests/MSManifest/Subdir/CMakeLists.txt index 8664572..3b4fccc 100644 --- a/Tests/MSManifest/Subdir/CMakeLists.txt +++ b/Tests/MSManifest/Subdir/CMakeLists.txt @@ -7,4 +7,8 @@ if(MSVC AND NOT MSVC_VERSION LESS 1400) -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake) add_executable(MSManifestNone main.c) set_property(TARGET MSManifestNone PROPERTY LINK_FLAGS "/MANIFEST:NO") +elseif(WIN32 AND CMAKE_C_COMPILER_ID MATCHES "Clang") + add_test(NAME MSManifest.Single COMMAND + ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest> + -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake) endif() diff --git a/Tests/MSManifest/Subdir2/CMakeLists.txt b/Tests/MSManifest/Subdir2/CMakeLists.txt index 19d8de7..0d960ad 100644 --- a/Tests/MSManifest/Subdir2/CMakeLists.txt +++ b/Tests/MSManifest/Subdir2/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(MSMultipleManifest main.c ${CMAKE_CURRENT_BINARY_DIR}/test_manifest2.manifest ${CMAKE_CURRENT_BINARY_DIR}/test_manifest3.manifest) -if(MSVC AND NOT MSVC_VERSION LESS 1400) +if((MSVC AND NOT MSVC_VERSION LESS 1400) OR (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "Clang") ) add_test(NAME MSManifest.Multiple COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSMultipleManifest> -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake) |