Updated PackageBuilder.cmake for submodule improvements