Improved option disabling on switching to OpenMM build in a non-clean build tree