Small reorganisation of cmake file