Redo cmake lists for os detecting