adam authored Dec 31, 2018 and Ben Gamari committed Jan 01, 2019

Also updates the windows gitlab ci to use the new configure variables.