finished + updated cmake-files