CMakeList made more 'automatic'