Remove icu data from windows executable
This commit is contained in:
parent
bf119ee0e3
commit
8f130ada92
16 changed files with 1542 additions and 9 deletions
|
|
@ -16,7 +16,7 @@ import re
|
|||
import json
|
||||
|
||||
class ConanSkia(ConanFile):
|
||||
name = "skia"
|
||||
name = "skia-infinipaint"
|
||||
package_type = "library"
|
||||
|
||||
# Optional metadata
|
||||
|
|
@ -431,7 +431,7 @@ class ConanSkia(ConanFile):
|
|||
self.requires("expat/[>=2.5.0]")
|
||||
|
||||
if self.options.use_icu and self.options.use_system_icu and self.options.use_conan_icu:
|
||||
self.requires("icu/77.1")
|
||||
self.requires("icu-infinipaint/77.1")
|
||||
|
||||
if (self.options.use_libpng_decode or self.options.use_libpng_encode) and self.options.use_system_libpng and self.options.use_conan_libpng:
|
||||
self.requires("libpng/[>=1.6.32]")
|
||||
|
|
@ -543,7 +543,7 @@ class ConanSkia(ConanFile):
|
|||
if self.options.use_icu and self.options.use_system_icu and self.options.use_conan_icu:
|
||||
replace_in_file(self, join(self.source_folder, "third_party", "icu", "BUILD.gn"),
|
||||
# icu-data must come after other components, otherwise it leaves an undefined symbol in shared library.
|
||||
"libs = [ \"icuuc\" ]", f"libs = {json.dumps(self._link_libs('icu', components=['icu-uc']))}", # 'icu-data' removed
|
||||
"libs = [ \"icuuc\" ]", f"libs = {json.dumps(self._link_libs('icu-infinipaint', components=['icu-uc']))}", # 'icu-data' removed
|
||||
strict=False)
|
||||
|
||||
if (self.options.use_libjpeg_turbo_encode or self.options.use_libjpeg_turbo_decode) and self.options.use_system_libjpeg_turbo and self.options.use_conan_libjpeg_turbo:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue