From 3dec0345e72f2491b12486f69d3b9d21cece493f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 28 Jul 2022 23:11:08 +0800 Subject: [PATCH] tools/ceph-dencoder: register dencoders in "lib" in dev env if "CMakeCache.txt" is found in current directory, try to load dencoder shared libraries from ./lib. this heuristics is used by `ceph.in` also for relaunching itself to get access to python bindings. Signed-off-by: Kefu Chai --- src/tools/ceph-dencoder/ceph_dencoder.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc index af039bdf4627e..a278e08629f5f 100644 --- a/src/tools/ceph-dencoder/ceph_dencoder.cc +++ b/src/tools/ceph-dencoder/ceph_dencoder.cc @@ -67,6 +67,8 @@ vector load_plugins() fs::path mod_dir{CEPH_DENC_MOD_DIR}; if (auto ceph_lib = getenv("CEPH_LIB"); ceph_lib) { mod_dir = ceph_lib; + } else if (fs::is_regular_file("CMakeCache.txt")) { + mod_dir = std::filesystem::canonical("lib"); } if (!fs::is_directory(mod_dir)) { std::cerr << "unable to load dencoders from " -- 2.39.5