Added more defines for MSVC build
Some cleanup of CMakeLists