diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-27 13:31:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-27 13:31:04 (GMT) |
| commit | 197b4e18d45331eab5225e6cb9433a13430fd0ba (patch) | |
| tree | 95938450118fe9d8ec70e03da755f15be26bc8c9 /Tests/RunCMake/CMakeLists.txt | |
| parent | 971b8c3c80372adf6cef54313927bc462f51d7da (diff) | |
| parent | 992962c76dd472fa9d122231c89d8d11aedd3288 (diff) | |
| download | CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.zip CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.tar.gz CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.tar.bz2 | |
Merge branch 'backport-fix-co-compile' into fix-co-compile
Resolve a logical conflict by replacing `cmArray{Begin,End}` from
the their side with `cm::{cbegin,cend}` from our side.
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index b70aeb9..5d584af 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -374,6 +374,12 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>) add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>) add_RunCMake_test(Cppcheck -DPSEUDO_CPPCHECK=$<TARGET_FILE:pseudo_cppcheck>) + add_RunCMake_test(MultiLint + -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy> + -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu> + -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint> + -DPSEUDO_CPPCHECK=$<TARGET_FILE:pseudo_cppcheck> + ) if(DEFINED CMake_TEST_CUDA) list(APPEND CompilerLauncher_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) endif() |