Update to CMake to be in line with encoder/decoder changes.