 - Add back packaging options to BuildOptions.cmake, where did they go?
 - Add back packaging options to BuildOptions.cmake, where did they go?

hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie