Fixup cmake build

Change-Id: Ia63d702015fe58226cfe32afb24690cc52ba870c
fixup win build

Change-Id: I33311ff97ac50fae8319c32b0ca9adb4cfb8ba96