diff options
| author | Kenney Phillis <kphillisjr@gmail.com> | 2020-03-06 05:18:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-21 12:10:45 (GMT) |
| commit | 7ca13e04fa9301325d7d0f7cd664829e65f2b4c1 (patch) | |
| tree | 308334f0e41a9eebca2d5dcdec46fd42d9921930 /Tests/MSManifest/Subdir | |
| parent | b8b804e2ed8dca3c6d116a6e8a1cb66cbd6ad241 (diff) | |
| download | CMake-7ca13e04fa9301325d7d0f7cd664829e65f2b4c1.zip CMake-7ca13e04fa9301325d7d0f7cd664829e65f2b4c1.tar.gz CMake-7ca13e04fa9301325d7d0f7cd664829e65f2b4c1.tar.bz2 | |
Windows: Merge user-provided manifests into compiled resource
Previously we merged user-provided manifests only into the manifest file
given to the linker. Merge them into the manifest file that is compiled
as a resource too.
Diffstat (limited to 'Tests/MSManifest/Subdir')
| -rw-r--r-- | Tests/MSManifest/Subdir/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Tests/MSManifest/Subdir/CMakeLists.txt b/Tests/MSManifest/Subdir/CMakeLists.txt index 11272bb..8664572 100644 --- a/Tests/MSManifest/Subdir/CMakeLists.txt +++ b/Tests/MSManifest/Subdir/CMakeLists.txt @@ -2,10 +2,9 @@ configure_file(test.manifest.in test.manifest) add_executable(MSManifest main.c ${CMAKE_CURRENT_BINARY_DIR}/test.manifest) if(MSVC AND NOT MSVC_VERSION LESS 1400) - add_custom_command(TARGET MSManifest POST_BUILD VERBATIM - COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest> - -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake - ) + add_test(NAME MSManifest.Single COMMAND + ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest> + -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake) add_executable(MSManifestNone main.c) set_property(TARGET MSManifestNone PROPERTY LINK_FLAGS "/MANIFEST:NO") endif() |