Updated CMakeLists and PackageBuilder.cmake for better submodule building.