Some Windows CMake fixes in trunk

[Jacob Champion]

For those of you using the CMakeLists on Windows, there are now a few 
bugfixes in trunk. If you have any spare time to make sure that they 
function properly in your workflow, that'd be much appreciated.

Thanks!
--Jacob