From 538feb96f7c5a6545f0bd8615b3d804e81716d83 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 20 Sep 2024 17:14:20 +0200 Subject: [PATCH] Fix vars --- conanfile.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 62225e8..7818653 100644 --- a/conanfile.py +++ b/conanfile.py @@ -122,9 +122,9 @@ def generate(self): vcpkg_triplet = "x64-windows" if self.settings.os == "Macos": - generator = "x64-osx" + vcpkg_triplet = "x64-osx" if self.settings.os == "Linux": - generator = "x64-linux" + vcpkg_triplet = "x64-linux" print("vcpkg_dir: ", vcpkg_dir) print("vcpkg_exe: ", vcpkg_exe) @@ -132,7 +132,9 @@ def generate(self): print("vcpkg_triplet: ", vcpkg_triplet) self.run(f"{vcpkg_exe} install --triplet {vcpkg_triplet}") - tc.variables["CMAKE_PROJECT_INCLUDE "] = vcpkg_tc + tc.variables["CMAKE_PROJECT_INCLUDE"] = vcpkg_tc + tc.variables["VCPKG_LIBRARY_LINKAGE"] = "dynamic" + tc.variables["VCPKG_ROOT"] = "vcpkg_dir" tc.generate()