I think this was fixed but seems to have been unfixed.  Just committed 
again


On Fri, 22 Jun 2018, Dave Seidel wrote:

> Can't run cmake on current develop due to a stray line on
> Opcodes/CMakeLists.txt, likely the remnant of a merge or rebase:
> 
> >>>>>>> 94f0ca6a99a288eef905baf145cc19f3b1e035ea
> 
> 
>