Code

Cmake: more fixes plus a patch for OSX paths by Henrik Gustafsson