Updated with Visual studio build in cmake