diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-13 20:16:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-19 15:40:40 (GMT) |
| commit | 67de5b7b82c6f61c5d349c70de81dde58bb79dd1 (patch) | |
| tree | aa04c9e284375dfd760a08fac13ba5018bdfcf97 /Tests/RunCMake | |
| parent | 0ae372daee75e6d5305ec9f934c2adce3074ca5d (diff) | |
| download | CMake-67de5b7b82c6f61c5d349c70de81dde58bb79dd1.zip CMake-67de5b7b82c6f61c5d349c70de81dde58bb79dd1.tar.gz CMake-67de5b7b82c6f61c5d349c70de81dde58bb79dd1.tar.bz2 | |
VS: Suppress MSBuild default settings affected by UseDebugLibraries
`Microsoft.Cl.Common.props` changes some default settings based on
`UseDebugLibraries`. CMake models its own controls for these settings,
so if the project does not set them, explicitly suppress them to avoid
letting `UseDebugLibraries` affect them.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/VsJustMyCode-check.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake b/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake index 689b35f..b5b195a 100644 --- a/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake +++ b/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake @@ -9,7 +9,7 @@ macro(RuntimeLibrary_check tgt rtl_expect) file(STRINGS "${vcProjectFile}" lines) foreach(line IN LISTS lines) - if(line MATCHES "^ *<RuntimeLibrary>([^<>]+)</RuntimeLibrary>") + if(line MATCHES "^ *<RuntimeLibrary>([^<>]*)</RuntimeLibrary>") set(rtl_actual "${CMAKE_MATCH_1}") if(NOT "${rtl_actual}" STREQUAL "${rtl_expect}") set(RunCMake_TEST_FAILED "Project file ${tgt}.vcxproj has RuntimeLibrary '${rtl_actual}', not '${rtl_expect}'.") diff --git a/Tests/RunCMake/VS10Project/VsJustMyCode-check.cmake b/Tests/RunCMake/VS10Project/VsJustMyCode-check.cmake index 7119976..e76d931 100644 --- a/Tests/RunCMake/VS10Project/VsJustMyCode-check.cmake +++ b/Tests/RunCMake/VS10Project/VsJustMyCode-check.cmake @@ -9,7 +9,7 @@ macro(VsJustMyCode_check tgt jmc_expect) file(STRINGS "${vcProjectFile}" lines) foreach(line IN LISTS lines) - if(line MATCHES "^ *<SupportJustMyCode>([^<>]+)</SupportJustMyCode>") + if(line MATCHES "^ *<SupportJustMyCode>([^<>]*)</SupportJustMyCode>") set(jmc_actual "${CMAKE_MATCH_1}") if(NOT "${jmc_actual}" STREQUAL "${jmc_expect}") set(RunCMake_TEST_FAILED "Project file ${tgt}.vcxproj has <SupportJustMyCode> '${jmc_actual}', not '${jmc_expect}'.") |