fix cmake comp

Change-Id: Ie765fb1ceab9d0290af82b6b14f7fdd87f33bb8c
fix error on cu database schema

Change-Id: I065b4592fdf53c41593e7ee40b0841d612668ed1