| commit | 9efd44991ac1925d1c5d034861c92d8542f747b5 | |
| author | M. Eric Irrgang <ericirrgang@gmail.com> | |
| Mon, 29 Jul 2019 11:15:01 +0000 (29 14:15 +0300) | ||
| committer | Paul Bauer <paul.bauer.q@gmail.com> | |
| Fri, 2 Aug 2019 09:09:15 +0000 (2 11:09 +0200) | ||
| tree | 371507c8467cb1aca1161e1102066cc6fc12d52f | treesnapshot (tar.gz zip) |
| parent | bbd70199c94b66dc53fcb862e3071dc62d14fada | commitdiff |
Reduce conflicts with external googletest files.
Move the custom googletest CMakeLists.txt up a level to src/external so
that we can just drop in the downloaded googletest bundle as it is
distributed. In a future change, we can use the gmock and gtest targets
defined in that infrastructure instead of sculpting our own.
Refs #3033
Change-Id: I4c8ed84195f7673fd798301ba149de8c122ccb05
Move the custom googletest CMakeLists.txt up a level to src/external so
that we can just drop in the downloaded googletest bundle as it is
distributed. In a future change, we can use the gmock and gtest targets
defined in that infrastructure instead of sculpting our own.
Refs #3033
Change-Id: I4c8ed84195f7673fd798301ba149de8c122ccb05
| src/CMakeLists.txt | diffblobblamehistory | |
| src/external/CMakeLists.txt | [new file with mode: 0644] | blob |
| src/external/googletest/CMakeLists.txt | [deleted file] | blobblamehistory |
| src/external/googletest/README.Gromacs | diffblobblamehistory |