cmake and Subsurface builds

[Willem Ferguson]

I was out of town for quite while and am trying to catch up to build the 
latest Subsurface git master.

It appears the switch to cmake is more or less accomplished. However, 
when I use the build.sh script, I get:
CMake Error: The source directory 
"/home/willem/subsurface/marble-source/build/src/lib/marble" does not 
appear to contain CMakeLists.txt.

If I build using the "traditional" approach, I get libdivecomputer 
errors reflecting the recent changes to OSTC compatability. But the 
installation of libdivecomputer following the build.sh script appeared 
to proceed normally and ended with a successful libdivecomputer build.

Does anyone have a pointer or two for building on Ubuntu 14.04??
Kind regards,
willem