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

pcre2: use version range for zlib + add package_type #19668

Merged
merged 3 commits into from
Sep 18, 2023
Merged

pcre2: use version range for zlib + add package_type #19668

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc9390f
use version range for zlib
SpaceIm Sep 7, 2023
e7364de
add package_type
SpaceIm Sep 7, 2023
8911277
Update recipes/pcre2/all/conanfile.py
AbrilRBS Sep 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
7 changes: 3 additions & 4 deletions recipes/pcre2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class PCRE2Conan(ConanFile):
description = "Perl Compatible Regular Expressions"
topics = ("regex", "regexp", "perl")
license = "BSD-3-Clause"

package_type = "library"
settings = "os", "arch", "compiler", "build_type"
options = {
"shared": [True, False],
Expand Down Expand Up @@ -65,7 +65,7 @@ def layout(self):

def requirements(self):
if self.options.get_safe("with_zlib"):
self.requires("zlib/1.2.13")
self.requires("zlib/[>=1.2.11 <2]")
if self.options.get_safe("with_bzip2"):
self.requires("bzip2/1.0.8")

Expand All @@ -76,8 +76,7 @@ def validate(self):
raise ConanInvalidConfiguration("build_pcre2_8 must be enabled for the pcre2grep program")

def source(self):
get(self, **self.conan_data["sources"][self.version],
destination=self.source_folder, strip_root=True)
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def generate(self):
tc = CMakeToolchain(self)
Expand Down