52eeb54 CMake related bugfixes from master branch.

git-subtree-dir: moose-core
git-subtree-split: 52eeb541ef49a54465e0964d27333fd5e2c8f3c2