updated cmake to work on win and andy's machine