[DO-1345] fixed windows packages (!16)

Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
aleksandr.vodyanov
2025-02-25 13:53:43 +03:00
committed by Aleksandr Vodyanov
parent 3759e1163f
commit a82e89a1bc
46 changed files with 679 additions and 197 deletions

View File

@@ -1,13 +1,13 @@
sources:
"1.1.0":
url: "ssh://git@git.avroid.tech.:2222/Mirrors/brotli"
branch: "v1.1.0"
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/brotli/archive/v1.1.0.tar.gz"
sha256: "e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff"
"1.0.9":
url: "ssh://git@git.avroid.tech.:2222/Mirrors/brotli"
branch: "v1.0.9"
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/brotli/archive/v1.0.9.tar.gz"
sha256: "f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46"
"1.0.7":
url: "ssh://git@git.avroid.tech.:2222/Mirrors/brotli"
branch: "v1.0.7"
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/brotli/archive/v1.0.7.tar.gz"
sha256: "4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c"
patches:
"1.1.0":
- patch_file: "patches/1.1.0-target-props.patch"

View File

@@ -1,7 +1,7 @@
from conan import ConanFile
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
from conan.tools.scm import Version, Git
from conan.tools.scm import Version
import os
required_conan_version = ">=1.53.0"
@@ -54,11 +54,7 @@ class BrotliConan(ConanFile):
cmake_layout(self, src_folder="src")
def source(self):
#get(self, **self.conan_data["sources"][self.version], strip_root=True)
git = Git(self)
sources = self.conan_data["sources"][self.version]
clone_args = ['--depth', '1', '--branch', sources["branch"]]
git.clone(url=sources["url"], target=self.source_folder, args=clone_args)
get(self, **self.conan_data["sources"][self.version], strip_root=True)
def generate(self):
tc = CMakeToolchain(self)

View File

@@ -21,6 +21,6 @@ class TestPackageConan(ConanFile):
cmake.build()
def test(self):
if can_run(self):
if can_run(self) and (self.settings.compiler != "gcc" or self.settings.os != "Windows"):
bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
self.run(bin_path, env="conanrun")