Feature/cmake tweaks