Move fixup_bundle CMake stuff into a separate file