Merge pull request #1717 from crondog/buildperftests

Build performance tests with CMake. Fixes #1708