Cmake Changes (Linux)

Finally got around to rebasing against the latest screenrewrite code for some old cmake changes as described on pull request #401