Update to latest master with appropriate cmake changes at the same time.
Attach a file by drag & drop or click to upload
