diff options
| author | ruki <[email protected]> | 2023-06-13 23:23:24 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-06-13 23:23:24 +0800 |
| commit | 662263560fe6714da6605da70802e123254eba92 (patch) | |
| tree | 5f1b46e7ef483cabe17d8798177794f6699a1580 | |
| parent | a0dfaf3aec07cf0c14e3eb81ffe00f69864d90da (diff) | |
fix vs_runtime for conan2.0
| -rw-r--r-- | xmake/modules/package/manager/conan/v2/install_package.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua index ed0918193..b58d28365 100644 --- a/xmake/modules/package/manager/conan/v2/install_package.lua +++ b/xmake/modules/package/manager/conan/v2/install_package.lua @@ -178,8 +178,10 @@ function _conan_generate_compiler_profile(profile, configs, opt) local vs = assert(config.get("vs"), "vs not found!") profile:print("compiler=msvc") profile:print("compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) - if configs.vs_runtime then - profile:print("compiler.runtime=" .. configs.vs_runtime) + local vs_runtime = configs.vs_runtime + if vs_runtime then + profile:print("compiler.runtime=" .. (vs_runtime:startswith("MD") and "dynamic" or "static")) + profile:print("compiler.runtime_type=" .. (vs_runtime:endswith("d") and "Debug" or "Release")) end elseif plat == "iphoneos" then local target_minver = nil |