Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kaitai_struct_cpp_stl_runtime: add version 0.10, support conan v 2 #14765

Merged
merged 3 commits into from
Jan 25, 2023
Merged

kaitai_struct_cpp_stl_runtime: add version 0.10, support conan v 2 #14765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901f92b
kaitai_struct_cpp_stl_runtime: add version 0.10, support conan v 2
toge Dec 15, 2022
defecfb
declare cmake_minimum_required first
toge Jan 11, 2023
0b7341d
fix patch definition
toge Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix patch definition
  • Loading branch information
@toge
toge committed Jan 11, 2023
commit 0b7341dd939700f6e020fbfcb5fe89a33e868b09
12 changes: 6 additions & 6 deletions recipes/kaitai_struct_cpp_stl_runtime/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ sources:
sha256: "058c01828692bf193cb862372651c572fcc43babbf2d664674409511b9f54e5b"
patches:
"0.10":
patch_file: "patches/0001-cmake-minimum-required.patch"
patch_description: "declare cmake_minimum_required first"
patch_type: "portability"
- patch_file: "patches/0001-cmake-minimum-required.patch"
patch_description: "declare cmake_minimum_required first"
patch_type: "portability"
"cci.20210701":
patch_file: "patches/0001-cmake-minimum-required.patch"
patch_description: "declare cmake_minimum_required first"
patch_type: "portability"
- patch_file: "patches/0001-cmake-minimum-required.patch"
patch_description: "declare cmake_minimum_required first"
patch_type: "portability"
6 changes: 5 additions & 1 deletion recipes/kaitai_struct_cpp_stl_runtime/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from conan import ConanFile
from conan.tools.files import get, copy
from conan.tools.files import get, copy, export_conandata_patches, apply_conandata_patches
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
import os

Expand All @@ -23,6 +23,9 @@ class KaitaiStructCppStlRuntimeConan(ConanFile):
}
short_paths = True

def export_sources(self):
export_conandata_patches(self)

def layout(self):
cmake_layout(self, src_folder="src")

Expand All @@ -47,6 +50,7 @@ def generate(self):
deps.generate()

def build(self):
apply_conandata_patches(self)
cmake = CMake(self)
cmake.configure()
cmake.build()
Expand Down