udpates to cmake build stuff to clean up.