More changes to CMake config for windows, will finish later