Merge pull request #1546 from henryiii/cleanup-cmake

Clean up cache non-advanced variable for subproject