e4e09212c5
Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining changes from both sides.
Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining changes from both sides.