CMake fixes for windows.

--BRJ and CAR