diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-14 14:19:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-14 14:20:09 (GMT) |
| commit | acca494801b6ef5e2658f47b8ffaf713178b7567 (patch) | |
| tree | 416755125a69dbaad7f7aee0988e35400a2cc7ca /Tests | |
| parent | 06c16b8b085909f84eefc345d544e5498938802b (diff) | |
| parent | 0512e94eb028e6c2ebbc2a3d50e82df1970fa05a (diff) | |
| download | CMake-acca494801b6ef5e2658f47b8ffaf713178b7567.zip CMake-acca494801b6ef5e2658f47b8ffaf713178b7567.tar.gz CMake-acca494801b6ef5e2658f47b8ffaf713178b7567.tar.bz2 | |
Merge topic 'test-pch-instantiate-templates'
0512e94eb0 Tests: Fix PchInstantiateTemplates case on macOS with CMAKE_OSX_ARCHITECTURES
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5217
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/PrecompileHeaders/PchInstantiateTemplates-check.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/PrecompileHeaders/PchInstantiateTemplates-check.cmake b/Tests/RunCMake/PrecompileHeaders/PchInstantiateTemplates-check.cmake index 648d387..81449ca 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchInstantiateTemplates-check.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchInstantiateTemplates-check.cmake @@ -1,7 +1,7 @@ file(STRINGS ${RunCMake_TEST_BINARY_DIR}/compile_commands.json empty_dir_commands - REGEX "command.*-fpch-instantiate-templates.*empty.dir/cmake_pch.h") + REGEX "command.*-fpch-instantiate-templates.*empty.dir/cmake_pch[A-Za-z0-9_.]*.h") file(STRINGS ${RunCMake_TEST_BINARY_DIR}/compile_commands.json foo_dir_commands - REGEX "command.*-fpch-instantiate-templates.*foo.dir/cmake_pch.h") + REGEX "command.*-fpch-instantiate-templates.*foo.dir/cmake_pch[A-Za-z0-9_.]*.h") list(LENGTH empty_dir_commands empty_dir_commands_size) list(LENGTH foo_dir_commands foo_dir_commands_size) |