summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-05-02 21:06:37 +0800
committerruki <[email protected]>2023-05-02 21:06:37 +0800
commit54705be6387cddcf0a8689a5f62114463e26189b (patch)
treef2268b07901e5bc5081925631d167a08dc0193e0
parent13d11b2929915f3118cd91845b31d2a6e0d55015 (diff)
fix plat/arch/mode for conan generator
-rw-r--r--xmake/scripts/conan/extensions/generators/xmake_generator.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/xmake/scripts/conan/extensions/generators/xmake_generator.py b/xmake/scripts/conan/extensions/generators/xmake_generator.py
index c7c4b2a0d..a7298615f 100644
--- a/xmake/scripts/conan/extensions/generators/xmake_generator.py
+++ b/xmake/scripts/conan/extensions/generators/xmake_generator.py
@@ -34,15 +34,14 @@ class XmakeGenerator:
dep_cppinfo = dep.cpp_info.copy()
dep_cppinfo.set_relative_base_folder(dep.package_folder)
dep_aggregate = dep_cppinfo.aggregated_components()
- print("dep_aggregate", dep_aggregate)
# format deps
deps = XmakeDepsFormatter(dep_aggregate)
# make template
- plat = "Linux"
- arch = "x86_64"
- mode = "Release"
+ plat = self._conanfile.settings.os
+ arch = self._conanfile.settings.arch
+ mode = self._conanfile.settings.build_type
template = (' {plat}_{arch}_{mode} = \n'
' {{\n'
' includedirs = {{{deps.include_paths}}},\n'