more Cmake cleanup to grab externals