cleanup some cmake target dependency structure