Cmake

#1

Updated cmake a bit preempting the build matrix

@jowr I rearranged what you did a little bit, although I had a problem with the linking stage with catch re redefinitions.