diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-16 11:27:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-16 11:27:16 (GMT) |
| commit | 30b7c40ad88a83eef1ef842bf93b777214808db4 (patch) | |
| tree | b567d977397981efa5a11602add9900486cdc759 /Source/cmGlobalVisualStudio15Generator.h | |
| parent | 43e8e0b6884ddcf3f55826c2247af268698f23a6 (diff) | |
| parent | 96fdde26bbbc969944e556ad649191cd21f46990 (diff) | |
| download | CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.zip CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.tar.gz CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.tar.bz2 | |
Merge topic 'gtest_discover_tests_timeout'
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
Diffstat (limited to 'Source/cmGlobalVisualStudio15Generator.h')
0 files changed, 0 insertions, 0 deletions