From db93d9665efd26ee9e84cec4ec22b8025b07811b Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 19 May 2023 23:43:23 +0800 Subject: fix conan package for 2.0 --- xmake/scripts/conan/extensions/generators/xmake_generator.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xmake/scripts/conan/extensions/generators/xmake_generator.py b/xmake/scripts/conan/extensions/generators/xmake_generator.py index a7298615f..2c796df26 100644 --- a/xmake/scripts/conan/extensions/generators/xmake_generator.py +++ b/xmake/scripts/conan/extensions/generators/xmake_generator.py @@ -31,9 +31,7 @@ class XmakeGenerator: #dep_name = require.ref.name # get aggregate dependency's cppinfo - dep_cppinfo = dep.cpp_info.copy() - dep_cppinfo.set_relative_base_folder(dep.package_folder) - dep_aggregate = dep_cppinfo.aggregated_components() + dep_aggregate = dep.cpp_info.aggregated_components() # format deps deps = XmakeDepsFormatter(dep_aggregate) -- cgit v1.3.1