From ffa9cd5e96ed2a10c9a9263d255a6fca51b745ba Mon Sep 17 00:00:00 2001 From: mikeravenelle Date: Sun, 21 Jan 2024 09:23:08 -0600 Subject: [PATCH] Added parent folder for commit instead of recipe folder and BUILD_VOICE_SUPPORT by default --- conan/conanfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conan/conanfile.py b/conan/conanfile.py index 41c5b57a09..364371d7c1 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -1,8 +1,9 @@ +import os from conan import ConanFile from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps from conan.tools.scm import Git from conan.tools.files import load, update_conandata - + class DPPConan(ConanFile): name = "dpp" version = "0.1" @@ -35,7 +36,7 @@ def layout(self): cmake_layout(self) def export(self): - git = Git(self, self.recipe_folder) + git = Git(self, os.path.dirname(self.recipe_folder)) scm_url, scm_commit = git.get_url_and_commit() update_conandata(self, {"sources": {"commit": scm_commit, "url": scm_url}}) @@ -50,6 +51,7 @@ def generate(self): deps.generate() tc = CMakeToolchain(self) tc.cache_variables["CONAN_EXPORTED"] = True + tc.cache_variables["BUILD_VOICE_SUPPORT"] = True tc.generate() def build(self):