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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6428235..b85b855 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -363,7 +363,10 @@ if(BUILD_TESTING) add_test_macro(VSResourceNinjaForceRSP VSResourceNinjaForceRSP) endif () endif() - ADD_TEST_MACRO(MSManifest MSManifest) + if(_isMultiConfig) + set(MSManifest_CTEST_OPTIONS -C $<CONFIGURATION>) + endif() + ADD_TEST_MACRO(MSManifest ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>) ADD_TEST_MACRO(Simple Simple) ADD_TEST_MACRO(PreOrder PreOrder) ADD_TEST_MACRO(MissingSourceFile MissingSourceFile) |