CMakeLists.txt fixes for windows (again)
Third time's the charm.