Merge branch 'ft600'
fixed cmake for versions without generator expressions (hopefully)
Merge branch 'master' into releases/tokumx-2.0