cmake file cleanup to suppress warnings on cmake 3.0