Changed to match updated CMake functions.
Updated
Fixes build issue with clang with libc++abi.
Added defaults for structuredataversions constructor
Merge branch 'next'