Improvements to CPACK configuration