Merge pull request #9 from madebr/stable/8.41

Set PCRE_STATIC=1 in package_info
bincrafters · Mar 8, 2019 · 8ac5b4b · 8ac5b4b
2 parents 8221ba3 + 3118043
commit 8ac5b4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -98,3 +98,5 @@ def package_info(self):
  self.cpp_info.libs = ['pcreposixd', 'pcred']
  else:
  self.cpp_info.libs = ['pcreposix', 'pcre']
+ if not self.options.shared:
+ self.cpp_info.defines.append("PCRE_STATIC=1")
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -12,8 +12,6 @@ class TestPackageConan(ConanFile):
 
  def build(self):
  cmake = CMake(self)
- if self.settings.os == "Windows" and not self.options['pcre'].shared:
- cmake.definitions['PCRE_STATIC'] = True
  cmake.configure()
  cmake.build()