cmake: fixes for non-assembly builds and windows builds
cmake: this time for reals