Updated CMake building to work after encoder/decoder changes.