Go back to gcc 8.3 until we add new build machinesAlso move the non-msvc settings out of the msvc block of cmake