diff options
| author | ruki <[email protected]> | 2025-06-18 00:59:38 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-06-18 00:59:38 +0800 |
| commit | 9afa83aafc6b4183f7f30f026ec2daacaf369d18 (patch) | |
| tree | e5885a1df9805c9cf204fac12f8d95eba7265d5f | |
| parent | a82f5c1d7a7d43485087341b978749698bfcc6a1 (diff) | |
add logs
3 files changed, 9 insertions, 7 deletions
diff --git a/xmake/modules/package/manager/conan/configurations.lua b/xmake/modules/package/manager/conan/configurations.lua index af045c1e1..23266392e 100644 --- a/xmake/modules/package/manager/conan/configurations.lua +++ b/xmake/modules/package/manager/conan/configurations.lua @@ -47,7 +47,7 @@ function plat(plat) iphoneos = "iOS", android = "Android", wasm = "Emscripten"} - return assert(map[plat], "unknown os(%s)!", plat) + return assert(map[plat], "unknown plat(%s)!", plat) end -- get build type diff --git a/xmake/modules/package/manager/conan/find_package.lua b/xmake/modules/package/manager/conan/find_package.lua index 12f8973de..dd714f365 100644 --- a/xmake/modules/package/manager/conan/find_package.lua +++ b/xmake/modules/package/manager/conan/find_package.lua @@ -47,6 +47,7 @@ end function _conan_get_buildinfo(name, opt) opt = opt or {} local buildinfo_file = _conan_get_buildinfo_file(name, opt.dep_name) + print("buildinfo_file", buildinfo_file) if not os.isfile(buildinfo_file) then return end @@ -57,6 +58,7 @@ function _conan_get_buildinfo(name, opt) return end local buildinfo = io.load(buildinfo_file) + print("buildinfo", buildinfo) if buildinfo then buildinfo = buildinfo[infokey] end diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua index ab25307f3..ba2a8f021 100644 --- a/xmake/modules/package/manager/conan/v2/install_package.lua +++ b/xmake/modules/package/manager/conan/v2/install_package.lua @@ -234,10 +234,10 @@ end function _conan_generate_build_profile(configs, opt) local profile = io.open("profile_build.txt", "w") profile:print("[settings]") - profile:print("arch=%s", configurations.arch(opt.arch)) + profile:print("arch=%s", configurations.arch(os.arch())) profile:print("build_type=%s", configurations.build_type(opt.mode)) - profile:print("os=%s", configurations.plat(opt.plat)) - _conan_generate_compiler_profile(profile, configs, opt) + profile:print("os=%s", configurations.plat(os.host())) + _conan_generate_compiler_profile(profile, configs, {plat = os.host(), arch = os.arch()}) profile:close() end @@ -245,10 +245,10 @@ end function _conan_generate_host_profile(configs, opt) local profile = io.open("profile_host.txt", "w") profile:print("[settings]") - profile:print("arch=%s", configurations.arch(os.arch())) + profile:print("arch=%s", configurations.arch(opt.arch)) profile:print("build_type=%s", configurations.build_type(opt.mode)) - profile:print("os=%s", configurations.plat(os.host())) - _conan_generate_compiler_profile(profile, configs, {plat = os.host(), arch = os.arch()}) + profile:print("os=%s", configurations.plat(opt.plat)) + _conan_generate_compiler_profile(profile, configs, opt) profile:close() end |
