More cmake updates to handle lack of environment variables for paths.