diff options
29 files changed, 844 insertions, 3 deletions
diff --git a/3party/icu/CMakeLists.txt b/3party/icu/CMakeLists.txt new file mode 100644 index 0000000000..3d5e4f7257 --- /dev/null +++ b/3party/icu/CMakeLists.txt @@ -0,0 +1,815 @@ +project(icu) + +add_definitions( + -DU_CHARSET_IS_UTF8=1 + -DU_STATIC_IMPLEMENTATION + -DU_COMMON_IMPLEMENTATION + -DU_I18N_IMPLEMENTATION + -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS) + +add_compile_options( + "-Wall" +) + +set(CMAKE_PREFIX_PATH ./) + +include_directories(common i18n common/unicode ./) + +set( + SRC + common/cmemory.c + common/cstring.c + common/cwchar.c + common/icudataver.c + common/locmap.c + common/propsvec.c + common/uarrsort.c + common/ubidi.c + common/ubidi_props.c + common/ubidiln.c + common/ubidiwrt.c + common/ucat.c + common/uchar.c + common/ucmndata.c + common/ucnv.c + common/ucnv_cb.c + common/ucnv_cnv.c + common/ucnv_ct.c + common/ucnv_err.c + common/ucnv_lmb.c + common/ucnv_set.c + common/ucnv_u16.c + common/ucnv_u32.c + common/ucnv_u7.c + common/ucnv_u8.c + common/ucnvdisp.c + common/ucnvhz.c + common/ucnvisci.c + common/ucnvlat1.c + common/ucnvscsu.c + common/udatamem.c + common/udataswp.c + common/uenum.c + common/uhash.c + common/uinvchar.c + common/ulist.c + common/uloc_tag.c + common/umapfile.c + common/umath.c + common/ures_cnv.c + common/usc_impl.c + common/uscript.c + common/ustrfmt.c + common/utf_impl.c + common/utrace.c + common/utypes.c + common/wintz.c + common/appendable.cpp + common/bmpset.cpp + common/brkeng.cpp + common/brkiter.cpp + common/bytestream.cpp + common/bytestrie.cpp + common/bytestriebuilder.cpp + common/bytestrieiterator.cpp + common/caniter.cpp + common/chariter.cpp + common/charstr.cpp + common/cstr.cpp + common/dictbe.cpp + common/dictionarydata.cpp + common/dtintrv.cpp + common/errorcode.cpp + common/filteredbrk.cpp + common/filterednormalizer2.cpp + common/icuplug.cpp + common/listformatter.cpp + common/loadednormalizer2impl.cpp + common/locavailable.cpp + common/locbased.cpp + common/locdispnames.cpp + common/locdspnm.cpp + common/locid.cpp + common/loclikely.cpp + common/locresdata.cpp + common/locutil.cpp + common/messagepattern.cpp + common/normalizer2.cpp + common/normalizer2impl.cpp + common/normlzr.cpp + common/parsepos.cpp + common/patternprops.cpp + common/pluralmap.cpp + common/propname.cpp + common/punycode.cpp + common/putil.cpp + common/rbbi.cpp + common/rbbidata.cpp + common/rbbinode.cpp + common/rbbirb.cpp + common/rbbiscan.cpp + common/rbbisetb.cpp + common/rbbistbl.cpp + common/rbbitblb.cpp + common/resbund.cpp + common/resbund_cnv.cpp + common/resource.cpp + common/ruleiter.cpp + common/schriter.cpp + common/serv.cpp + common/servlk.cpp + common/servlkf.cpp + common/servls.cpp + common/servnotf.cpp + common/servrbf.cpp + common/servslkf.cpp + common/sharedobject.cpp + common/simpleformatter.cpp + common/stringpiece.cpp + common/stringtriebuilder.cpp + common/ubrk.cpp + common/ucase.cpp + common/ucasemap.cpp + common/ucasemap_titlecase_brkiter.cpp + common/ucharstrie.cpp + common/ucharstriebuilder.cpp + common/ucharstrieiterator.cpp + common/uchriter.cpp + common/ucln_cmn.cpp + common/ucnv2022.cpp + common/ucnv_bld.cpp + common/ucnv_ext.cpp + common/ucnv_io.cpp + common/ucnvbocu.cpp + common/ucnvmbcs.cpp + common/ucnvsel.cpp + common/ucol_swp.cpp + common/ucurr.cpp + common/udata.cpp + common/uhash_us.cpp + common/uidna.cpp + common/uinit.cpp + common/uiter.cpp + common/ulistformatter.cpp + common/uloc.cpp + common/uloc_keytype.cpp + common/umutex.cpp + common/unames.cpp + common/unifiedcache.cpp + common/unifilt.cpp + common/unifunct.cpp + common/uniset.cpp + common/uniset_closure.cpp + common/uniset_props.cpp + common/unisetspan.cpp + common/unistr.cpp + common/unistr_case.cpp + common/unistr_case_locale.cpp + common/unistr_cnv.cpp + common/unistr_props.cpp + common/unistr_titlecase_brkiter.cpp + common/unorm.cpp + common/unormcmp.cpp + common/uobject.cpp + common/uprops.cpp + common/uresbund.cpp + common/uresdata.cpp + common/uscript_props.cpp + common/uset.cpp + common/uset_props.cpp + common/usetiter.cpp + common/ushape.cpp + common/usprep.cpp + common/ustack.cpp + common/ustr_cnv.cpp + common/ustr_titlecase_brkiter.cpp + common/ustr_wcs.cpp + common/ustrcase.cpp + common/ustrcase_locale.cpp + common/ustrenum.cpp + common/ustring.cpp + common/ustrtrns.cpp + common/utext.cpp + common/util.cpp + common/util_props.cpp + common/utrie.cpp + common/utrie2.cpp + common/utrie2_builder.cpp + common/uts46.cpp + common/uvector.cpp + common/uvectr32.cpp + common/uvectr64.cpp + i18n/decContext.c + i18n/decNumber.c + i18n/ulocdata.c + i18n/utmscale.c + i18n/affixpatternparser.cpp + i18n/alphaindex.cpp + i18n/anytrans.cpp + i18n/astro.cpp + i18n/basictz.cpp + i18n/bocsu.cpp + i18n/brktrans.cpp + i18n/buddhcal.cpp + i18n/calendar.cpp + i18n/casetrn.cpp + i18n/cecal.cpp + i18n/chnsecal.cpp + i18n/choicfmt.cpp + i18n/coleitr.cpp + i18n/coll.cpp + i18n/collation.cpp + i18n/collationbuilder.cpp + i18n/collationcompare.cpp + i18n/collationdata.cpp + i18n/collationdatabuilder.cpp + i18n/collationdatareader.cpp + i18n/collationdatawriter.cpp + i18n/collationfastlatin.cpp + i18n/collationfastlatinbuilder.cpp + i18n/collationfcd.cpp + i18n/collationiterator.cpp + i18n/collationkeys.cpp + i18n/collationroot.cpp + i18n/collationrootelements.cpp + i18n/collationruleparser.cpp + i18n/collationsets.cpp + i18n/collationsettings.cpp + i18n/collationtailoring.cpp + i18n/collationweights.cpp + i18n/compactdecimalformat.cpp + i18n/coptccal.cpp + i18n/cpdtrans.cpp + i18n/csdetect.cpp + i18n/csmatch.cpp + i18n/csr2022.cpp + i18n/csrecog.cpp + i18n/csrmbcs.cpp + i18n/csrsbcs.cpp + i18n/csrucode.cpp + i18n/csrutf8.cpp + i18n/curramt.cpp + i18n/currfmt.cpp + i18n/currpinf.cpp + i18n/currunit.cpp + i18n/dangical.cpp + i18n/datefmt.cpp + i18n/dayperiodrules.cpp + i18n/dcfmtsym.cpp + i18n/decfmtst.cpp + i18n/decimalformatpattern.cpp + i18n/decimfmt.cpp + i18n/decimfmtimpl.cpp + i18n/digitaffix.cpp + i18n/digitaffixesandpadding.cpp + i18n/digitformatter.cpp + i18n/digitgrouping.cpp + i18n/digitinterval.cpp + i18n/digitlst.cpp + i18n/dtfmtsym.cpp + i18n/dtitvfmt.cpp + i18n/dtitvinf.cpp + i18n/dtptngen.cpp + i18n/dtrule.cpp + i18n/esctrn.cpp + i18n/ethpccal.cpp + i18n/fmtable.cpp + i18n/fmtable_cnv.cpp + i18n/format.cpp + i18n/fphdlimp.cpp + i18n/fpositer.cpp + i18n/funcrepl.cpp + i18n/gender.cpp + i18n/gregocal.cpp + i18n/gregoimp.cpp + i18n/hebrwcal.cpp + i18n/identifier_info.cpp + i18n/indiancal.cpp + i18n/inputext.cpp + i18n/islamcal.cpp + i18n/japancal.cpp + i18n/measfmt.cpp + i18n/measunit.cpp + i18n/measure.cpp + i18n/msgfmt.cpp + i18n/name2uni.cpp + i18n/nfrs.cpp + i18n/nfrule.cpp + i18n/nfsubs.cpp + i18n/nortrans.cpp + i18n/nultrans.cpp + i18n/numfmt.cpp + i18n/numsys.cpp + i18n/olsontz.cpp + i18n/persncal.cpp + i18n/pluralaffix.cpp + i18n/plurfmt.cpp + i18n/plurrule.cpp + i18n/precision.cpp + i18n/quant.cpp + i18n/quantityformatter.cpp + i18n/rbnf.cpp + i18n/rbt.cpp + i18n/rbt_data.cpp + i18n/rbt_pars.cpp + i18n/rbt_rule.cpp + i18n/rbt_set.cpp + i18n/rbtz.cpp + i18n/regexcmp.cpp + i18n/regeximp.cpp + i18n/regexst.cpp + i18n/regextxt.cpp + i18n/region.cpp + i18n/reldatefmt.cpp + i18n/reldtfmt.cpp + i18n/rematch.cpp + i18n/remtrans.cpp + i18n/repattrn.cpp + i18n/rulebasedcollator.cpp + i18n/scientificnumberformatter.cpp + i18n/scriptset.cpp + i18n/search.cpp + i18n/selfmt.cpp + i18n/sharedbreakiterator.cpp + i18n/simpletz.cpp + i18n/smallintformatter.cpp + i18n/smpdtfmt.cpp + i18n/smpdtfst.cpp + i18n/sortkey.cpp + i18n/standardplural.cpp + i18n/strmatch.cpp + i18n/strrepl.cpp + i18n/stsearch.cpp + i18n/taiwncal.cpp + i18n/timezone.cpp + i18n/titletrn.cpp + i18n/tmunit.cpp + i18n/tmutamt.cpp + i18n/tmutfmt.cpp + i18n/tolowtrn.cpp + i18n/toupptrn.cpp + i18n/translit.cpp + i18n/transreg.cpp + i18n/tridpars.cpp + i18n/tzfmt.cpp + i18n/tzgnames.cpp + i18n/tznames.cpp + i18n/tznames_impl.cpp + i18n/tzrule.cpp + i18n/tztrans.cpp + i18n/ucal.cpp + i18n/ucln_in.cpp + i18n/ucol.cpp + i18n/ucol_res.cpp + i18n/ucol_sit.cpp + i18n/ucoleitr.cpp + i18n/ucsdet.cpp + i18n/udat.cpp + i18n/udateintervalformat.cpp + i18n/udatpg.cpp + i18n/ufieldpositer.cpp + i18n/uitercollationiterator.cpp + i18n/umsg.cpp + i18n/unesctrn.cpp + i18n/uni2name.cpp + i18n/unum.cpp + i18n/unumsys.cpp + i18n/upluralrules.cpp + i18n/uregex.cpp + i18n/uregexc.cpp + i18n/uregion.cpp + i18n/usearch.cpp + i18n/uspoof.cpp + i18n/uspoof_build.cpp + i18n/uspoof_conf.cpp + i18n/uspoof_impl.cpp + i18n/uspoof_wsconf.cpp + i18n/utf16collationiterator.cpp + i18n/utf8collationiterator.cpp + i18n/utrans.cpp + i18n/valueformatter.cpp + i18n/visibledigits.cpp + i18n/vtzone.cpp + i18n/vzone.cpp + i18n/windtfmt.cpp + i18n/winnmfmt.cpp + i18n/wintzimpl.cpp + i18n/zonemeta.cpp + i18n/zrule.cpp + i18n/ztrans.cpp + stubdata/stubdata.c + + common/unicode/appendable.h + common/unicode/brkiter.h + common/unicode/bytestream.h + common/unicode/bytestrie.h + common/unicode/bytestriebuilder.h + common/unicode/caniter.h + common/unicode/chariter.h + common/unicode/dbbi.h + common/unicode/docmain.h + common/unicode/dtintrv.h + common/unicode/enumset.h + common/unicode/errorcode.h + common/unicode/filteredbrk.h + common/unicode/icudataver.h + common/unicode/icuplug.h + common/unicode/idna.h + common/unicode/listformatter.h + common/unicode/localpointer.h + common/unicode/locdspnm.h + common/unicode/locid.h + common/unicode/messagepattern.h + common/unicode/normalizer2.h + common/unicode/normlzr.h + common/unicode/parseerr.h + common/unicode/parsepos.h + common/unicode/platform.h + common/unicode/ptypes.h + common/unicode/putil.h + common/unicode/rbbi.h + common/unicode/rep.h + common/unicode/resbund.h + common/unicode/schriter.h + common/unicode/simpleformatter.h + common/unicode/std_string.h + common/unicode/strenum.h + common/unicode/stringpiece.h + common/unicode/stringtriebuilder.h + common/unicode/symtable.h + common/unicode/ubidi.h + common/unicode/ubrk.h + common/unicode/ucasemap.h + common/unicode/ucat.h + common/unicode/uchar.h + common/unicode/ucharstrie.h + common/unicode/ucharstriebuilder.h + common/unicode/uchriter.h + common/unicode/uclean.h + common/unicode/ucnv.h + common/unicode/ucnv_cb.h + common/unicode/ucnv_err.h + common/unicode/ucnvsel.h + common/unicode/uconfig.h + common/unicode/ucurr.h + common/unicode/udata.h + common/unicode/udisplaycontext.h + common/unicode/uenum.h + common/unicode/uidna.h + common/unicode/uiter.h + common/unicode/uldnames.h + common/unicode/ulistformatter.h + common/unicode/uloc.h + common/unicode/umachine.h + common/unicode/umisc.h + common/unicode/unifilt.h + common/unicode/unifunct.h + common/unicode/unimatch.h + common/unicode/uniset.h + common/unicode/unistr.h + common/unicode/unorm.h + common/unicode/unorm2.h + common/unicode/uobject.h + common/unicode/urename.h + common/unicode/urep.h + common/unicode/ures.h + common/unicode/uscript.h + common/unicode/uset.h + common/unicode/usetiter.h + common/unicode/ushape.h + common/unicode/usprep.h + common/unicode/ustring.h + common/unicode/ustringtrie.h + common/unicode/utext.h + common/unicode/utf.h + common/unicode/utf16.h + common/unicode/utf32.h + common/unicode/utf8.h + common/unicode/utf_old.h + common/unicode/utrace.h + common/unicode/utypes.h + common/unicode/uvernum.h + common/unicode/uversion.h + common/bmpset.h + common/brkeng.h + common/charstr.h + common/cmemory.h + common/common.rc + common/cpputils.h + common/cstr.h + common/cstring.h + common/cwchar.h + common/dictbe.h + common/dictionarydata.h + common/hash.h + common/icuplugimp.h + common/localsvc.h + common/locbased.h + common/locmap.h + common/locutil.h + common/messageimpl.h + common/msvcres.h + common/mutex.h + common/norm2_nfc_data.h + common/norm2allmodes.h + common/normalizer2impl.h + common/patternprops.h + common/pluralmap.h + common/propname.h + common/propname_data.h + common/propsvec.h + common/punycode.h + common/putilimp.h + common/rbbidata.h + common/rbbinode.h + common/rbbirb.h + common/rbbirpt.h + common/rbbiscan.h + common/rbbisetb.h + common/rbbitblb.h + common/resource.h + common/ruleiter.h + common/serv.h + common/servloc.h + common/servnotf.h + common/sharedobject.h + common/sprpimpl.h + common/uarrsort.h + common/uassert.h + common/ubidi_props.h + common/ubidi_props_data.h + common/ubidiimp.h + common/ubrkimpl.h + common/ucase.h + common/ucase_props_data.h + common/uchar_props_data.h + common/ucln.h + common/ucln_cmn.h + common/ucln_imp.h + common/ucmndata.h + common/ucnv_bld.h + common/ucnv_cnv.h + common/ucnv_ext.h + common/ucnv_imp.h + common/ucnv_io.h + common/ucnvmbcs.h + common/ucol_data.h + common/ucol_swp.h + common/ucurrimp.h + common/udatamem.h + common/udataswp.h + common/uelement.h + common/uenumimp.h + common/uhash.h + common/uinvchar.h + common/ulist.h + common/ulocimp.h + common/umapfile.h + common/umutex.h + common/unifiedcache.h + common/unisetspan.h + common/unistrappender.h + common/unormimp.h + common/uposixdefs.h + common/uprops.h + common/uresdata.h + common/uresimp.h + common/ureslocs.h + common/usc_impl.h + common/uset_imp.h + common/ustr_cnv.h + common/ustr_imp.h + common/ustrenum.h + common/ustrfmt.h + common/util.h + common/utracimp.h + common/utrie.h + common/utrie2.h + common/utrie2_impl.h + common/utypeinfo.h + common/uvector.h + common/uvectr32.h + common/uvectr64.h + common/wintz.h + i18n/unicode/alphaindex.h + i18n/unicode/basictz.h + i18n/unicode/calendar.h + i18n/unicode/choicfmt.h + i18n/unicode/coleitr.h + i18n/unicode/coll.h + i18n/unicode/compactdecimalformat.h + i18n/unicode/curramt.h + i18n/unicode/currpinf.h + i18n/unicode/currunit.h + i18n/unicode/datefmt.h + i18n/unicode/dcfmtsym.h + i18n/unicode/decimfmt.h + i18n/unicode/dtfmtsym.h + i18n/unicode/dtitvfmt.h + i18n/unicode/dtitvinf.h + i18n/unicode/dtptngen.h + i18n/unicode/dtrule.h + i18n/unicode/fieldpos.h + i18n/unicode/fmtable.h + i18n/unicode/format.h + i18n/unicode/fpositer.h + i18n/unicode/gender.h + i18n/unicode/gregocal.h + i18n/unicode/measfmt.h + i18n/unicode/measunit.h + i18n/unicode/measure.h + i18n/unicode/msgfmt.h + i18n/unicode/numfmt.h + i18n/unicode/numsys.h + i18n/unicode/plurfmt.h + i18n/unicode/plurrule.h + i18n/unicode/rbnf.h + i18n/unicode/rbtz.h + i18n/unicode/regex.h + i18n/unicode/region.h + i18n/unicode/reldatefmt.h + i18n/unicode/scientificnumberformatter.h + i18n/unicode/search.h + i18n/unicode/selfmt.h + i18n/unicode/simpletz.h + i18n/unicode/smpdtfmt.h + i18n/unicode/sortkey.h + i18n/unicode/stsearch.h + i18n/unicode/tblcoll.h + i18n/unicode/timezone.h + i18n/unicode/tmunit.h + i18n/unicode/tmutamt.h + i18n/unicode/tmutfmt.h + i18n/unicode/translit.h + i18n/unicode/tzfmt.h + i18n/unicode/tznames.h + i18n/unicode/tzrule.h + i18n/unicode/tztrans.h + i18n/unicode/ucal.h + i18n/unicode/ucol.h + i18n/unicode/ucoleitr.h + i18n/unicode/ucsdet.h + i18n/unicode/udat.h + i18n/unicode/udateintervalformat.h + i18n/unicode/udatpg.h + i18n/unicode/ufieldpositer.h + i18n/unicode/uformattable.h + i18n/unicode/ugender.h + i18n/unicode/ulocdata.h + i18n/unicode/umsg.h + i18n/unicode/unirepl.h + i18n/unicode/unum.h + i18n/unicode/unumsys.h + i18n/unicode/upluralrules.h + i18n/unicode/uregex.h + i18n/unicode/uregion.h + i18n/unicode/ureldatefmt.h + i18n/unicode/usearch.h + i18n/unicode/uspoof.h + i18n/unicode/utmscale.h + i18n/unicode/utrans.h + i18n/unicode/vtzone.h + i18n/affixpatternparser.h + i18n/anytrans.h + i18n/astro.h + i18n/bocsu.h + i18n/brktrans.h + i18n/buddhcal.h + i18n/casetrn.h + i18n/cecal.h + i18n/chnsecal.h + i18n/collation.h + i18n/collationbuilder.h + i18n/collationcompare.h + i18n/collationdata.h + i18n/collationdatabuilder.h + i18n/collationdatareader.h + i18n/collationdatawriter.h + i18n/collationfastlatin.h + i18n/collationfastlatinbuilder.h + i18n/collationfcd.h + i18n/collationiterator.h + i18n/collationkeys.h + i18n/collationroot.h + i18n/collationrootelements.h + i18n/collationruleparser.h + i18n/collationsets.h + i18n/collationsettings.h + i18n/collationtailoring.h + i18n/collationweights.h + i18n/collunsafe.h + i18n/coptccal.h + i18n/cpdtrans.h + i18n/csdetect.h + i18n/csmatch.h + i18n/csr2022.h + i18n/csrecog.h + i18n/csrmbcs.h + i18n/csrsbcs.h + i18n/csrucode.h + i18n/csrutf8.h + i18n/currfmt.h + i18n/dangical.h + i18n/dayperiodrules.h + i18n/dcfmtimp.h + i18n/decContext.h + i18n/decfmtst.h + i18n/decimalformatpattern.h + i18n/decimalformatpatternimpl.h + i18n/decimfmtimpl.h + i18n/decNumber.h + i18n/decNumberLocal.h + i18n/digitaffix.h + i18n/digitaffixesandpadding.h + i18n/digitformatter.h + i18n/digitgrouping.h + i18n/digitinterval.h + i18n/digitlst.h + i18n/dtitv_impl.h + i18n/dtptngen_impl.h + i18n/esctrn.h + i18n/ethpccal.h + i18n/fmtableimp.h + i18n/fphdlimp.h + i18n/funcrepl.h + i18n/gregoimp.h + i18n/hebrwcal.h + i18n/identifier_info.h + i18n/indiancal.h + i18n/inputext.h + i18n/islamcal.h + i18n/japancal.h + i18n/msgfmt_impl.h + i18n/name2uni.h + i18n/nfrlist.h + i18n/nfrs.h + i18n/nfrule.h + i18n/nfsubs.h + i18n/nortrans.h + i18n/nultrans.h + i18n/numsys_impl.h + i18n/olsontz.h + i18n/persncal.h + i18n/pluralaffix.h + i18n/plurrule_impl.h + i18n/precision.h + i18n/quant.h + i18n/quantityformatter.h + i18n/rbt.h + i18n/rbt_data.h + i18n/rbt_pars.h + i18n/rbt_rule.h + i18n/rbt_set.h + i18n/regexcmp.h + i18n/regexcst.h + i18n/regeximp.h + i18n/regexst.h + i18n/regextxt.h + i18n/region_impl.h + i18n/reldtfmt.h + i18n/remtrans.h + i18n/scriptset.h + i18n/selfmtimpl.h + i18n/sharedbreakiterator.h + i18n/sharedcalendar.h + i18n/shareddateformatsymbols.h + i18n/sharednumberformat.h + i18n/sharedpluralrules.h + i18n/significantdigitinterval.h + i18n/smallintformatter.h + i18n/smpdtfst.h + i18n/standardplural.h + i18n/strmatch.h + i18n/strrepl.h + i18n/taiwncal.h + i18n/titletrn.h + i18n/tolowtrn.h + i18n/toupptrn.h + i18n/transreg.h + i18n/tridpars.h + i18n/tzgnames.h + i18n/tznames_impl.h + i18n/ucln_in.h + i18n/ucol_imp.h + i18n/uitercollationiterator.h + i18n/umsg_imp.h + i18n/unesctrn.h + i18n/uni2name.h + i18n/uspoof_conf.h + i18n/uspoof_impl.h + i18n/uspoof_wsconf.h + i18n/usrchimp.h + i18n/utf16collationiterator.h + i18n/utf8collationiterator.h + i18n/valueformatter.h + i18n/visibledigits.h + i18n/vzone.h + i18n/windtfmt.h + i18n/winnmfmt.h + i18n/wintzimpl.h + i18n/zonemeta.h + i18n/zrule.h + i18n/ztrans.h +) + +add_library(${PROJECT_NAME} ${SRC}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 933cb5908f..5010d398f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,6 +228,7 @@ add_subdirectory(3party/jansson) add_subdirectory(3party/minizip) add_subdirectory(3party/freetype) add_subdirectory(3party/fribidi) +add_subdirectory(3party/icu) add_subdirectory(3party/expat) add_subdirectory(map) diff --git a/drape/drape_tests/CMakeLists.txt b/drape/drape_tests/CMakeLists.txt index 35220e99d2..802ce66603 100644 --- a/drape/drape_tests/CMakeLists.txt +++ b/drape/drape_tests/CMakeLists.txt @@ -57,6 +57,7 @@ omim_link_libraries( geometry base fribidi + icu expat stats_client freetype diff --git a/drape_frontend/drape_frontend_tests/CMakeLists.txt b/drape_frontend/drape_frontend_tests/CMakeLists.txt index 8b041880d7..cdc91b722b 100644 --- a/drape_frontend/drape_frontend_tests/CMakeLists.txt +++ b/drape_frontend/drape_frontend_tests/CMakeLists.txt @@ -29,6 +29,7 @@ omim_link_libraries( stats_client stb_image sdf_image + icu ${LIBZ} ) diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt index cf21475da7..4ab08ac789 100644 --- a/generator/generator_tests/CMakeLists.txt +++ b/generator/generator_tests/CMakeLists.txt @@ -49,6 +49,7 @@ omim_link_libraries( freetype expat fribidi + icu jansson protobuf osrm diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt index d84a7b3032..fc4bcb2b03 100644 --- a/generator/generator_tool/CMakeLists.txt +++ b/generator/generator_tool/CMakeLists.txt @@ -24,6 +24,7 @@ omim_link_libraries( freetype expat fribidi + icu jansson protobuf osrm diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt index b7c93770d1..12f6ed3dfc 100644 --- a/indexer/CMakeLists.txt +++ b/indexer/CMakeLists.txt @@ -1,6 +1,6 @@ project(indexer) -include_directories(${OMIM_ROOT}/3party/protobuf/src) +include_directories(${OMIM_ROOT}/3party/protobuf/src ${OMIM_ROOT}/3party/icu/common ${OMIM_ROOT}/3party/icu/i18n) set( SRC diff --git a/indexer/indexer_tests/CMakeLists.txt b/indexer/indexer_tests/CMakeLists.txt index 5489408437..3e49a1e8ed 100644 --- a/indexer/indexer_tests/CMakeLists.txt +++ b/indexer/indexer_tests/CMakeLists.txt @@ -58,6 +58,7 @@ omim_link_libraries( geometry base stats_client + icu jansson tess2 protobuf diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index 5b52e62ede..5c0e47a99b 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -40,6 +40,7 @@ omim_link_libraries( base freetype fribidi + icu expat protobuf jansson diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt index 4c7f3d50e7..642e914817 100644 --- a/map/mwm_tests/CMakeLists.txt +++ b/map/mwm_tests/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( opening_hours freetype fribidi + icu expat oauthcpp protobuf diff --git a/map/style_tests/CMakeLists.txt b/map/style_tests/CMakeLists.txt index 431c6af4c4..a6ee3465cd 100644 --- a/map/style_tests/CMakeLists.txt +++ b/map/style_tests/CMakeLists.txt @@ -25,6 +25,7 @@ omim_link_libraries( oauthcpp platform jansson + icu geometry coding base diff --git a/openlr/openlr_stat/CMakeLists.txt b/openlr/openlr_stat/CMakeLists.txt index 2200d15376..a612c770c1 100644 --- a/openlr/openlr_stat/CMakeLists.txt +++ b/openlr/openlr_stat/CMakeLists.txt @@ -19,6 +19,7 @@ omim_link_libraries(${PROJECT_NAME} coding base gflags + icu jansson oauthcpp opening_hours diff --git a/openlr/openlr_tests/CMakeLists.txt b/openlr/openlr_tests/CMakeLists.txt index 39c11f7d71..ba5049733e 100644 --- a/openlr/openlr_tests/CMakeLists.txt +++ b/openlr/openlr_tests/CMakeLists.txt @@ -22,6 +22,7 @@ omim_link_libraries( opening_hours pugixml stats_client + icu ${Qt5Core_LIBRARIES} ${LIBZ} ) diff --git a/partners_api/partners_api_tests/CMakeLists.txt b/partners_api/partners_api_tests/CMakeLists.txt index 45dfdd69ec..2e8eb3efef 100644 --- a/partners_api/partners_api_tests/CMakeLists.txt +++ b/partners_api/partners_api_tests/CMakeLists.txt @@ -26,6 +26,7 @@ omim_link_libraries( protobuf oauthcpp opening_hours + icu ${LIBZ} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index a808ad2556..874c3a791d 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -72,9 +72,8 @@ omim_link_libraries( base freetype expat - icuuc - icui18n fribidi + icu jansson protobuf osrm @@ -153,6 +152,7 @@ copy_resources( World.mwm WorldCoasts.mwm WorldCoasts_obsolete.mwm + icudt57l.dat.zip 01_dejavusans.ttf 02_droidsans-fallback.ttf diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt index c2a1535b61..24655fc57c 100644 --- a/routing/routing_consistency_tests/CMakeLists.txt +++ b/routing/routing_consistency_tests/CMakeLists.txt @@ -38,6 +38,7 @@ omim_link_libraries( generator gflags pugixml + icu ${Qt5Widgets_LIBRARIES} ${LIBZ} ) diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt index e8bbab0b4e..aa90ea281d 100644 --- a/routing/routing_integration_tests/CMakeLists.txt +++ b/routing/routing_integration_tests/CMakeLists.txt @@ -46,6 +46,7 @@ omim_link_libraries( stats_client pugixml opening_hours + icu ${LIBZ} ) diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt index 349191b673..cbb309cff6 100644 --- a/routing/routing_tests/CMakeLists.txt +++ b/routing/routing_tests/CMakeLists.txt @@ -54,6 +54,7 @@ omim_link_libraries( map pugixml stats_client + icu ${LIBZ} ) diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/routing_common/routing_common_tests/CMakeLists.txt index e17bf093f8..0a31cb5b11 100644 --- a/routing_common/routing_common_tests/CMakeLists.txt +++ b/routing_common/routing_common_tests/CMakeLists.txt @@ -28,6 +28,7 @@ omim_link_libraries( map pugixml stats_client + icu ${LIBZ} ) diff --git a/search/pysearch/CMakeLists.txt b/search/pysearch/CMakeLists.txt index 3adc9438f4..432e01eb9a 100644 --- a/search/pysearch/CMakeLists.txt +++ b/search/pysearch/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( jansson oauthcpp stats_client + icu ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${LIBZ} diff --git a/search/search_integration_tests/CMakeLists.txt b/search/search_integration_tests/CMakeLists.txt index bb8536ad3a..6461b8b283 100644 --- a/search/search_integration_tests/CMakeLists.txt +++ b/search/search_integration_tests/CMakeLists.txt @@ -40,6 +40,7 @@ omim_link_libraries( succinct pugixml opening_hours + icu ${Qt5Network_LIBRARIES} ${LIBZ} ) diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index 9eac1912f6..f6d368c95f 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -58,6 +58,7 @@ omim_link_libraries( expat freetype fribidi + icu gflags jansson minizip diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/search/search_quality/features_collector_tool/CMakeLists.txt index f03afc038d..52fce30cf4 100644 --- a/search/search_quality/features_collector_tool/CMakeLists.txt +++ b/search/search_quality/features_collector_tool/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( succinct opening_hours pugixml + icu ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${LIBZ} diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/search/search_quality/search_quality_tool/CMakeLists.txt index a7b3d90a05..4789d54ef0 100644 --- a/search/search_quality/search_quality_tool/CMakeLists.txt +++ b/search/search_quality/search_quality_tool/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( succinct opening_hours pugixml + icu ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${LIBZ} diff --git a/search/search_tests/CMakeLists.txt b/search/search_tests/CMakeLists.txt index 40d05107a7..37f5627481 100644 --- a/search/search_tests/CMakeLists.txt +++ b/search/search_tests/CMakeLists.txt @@ -41,6 +41,7 @@ omim_link_libraries( pugixml stats_client succinct + icu ${LIBZ} ) diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 819484bab7..0c6c2dc311 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -40,6 +40,7 @@ omim_link_libraries( freetype expat fribidi + icu jansson protobuf osrm diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index eaf31cce26..7b5b137f74 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -46,6 +46,7 @@ omim_link_libraries( freetype expat fribidi + icu jansson tess2 protobuf diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt index 2d1946bdf5..a3f7d886de 100644 --- a/traffic/pytraffic/CMakeLists.txt +++ b/traffic/pytraffic/CMakeLists.txt @@ -39,6 +39,7 @@ omim_link_libraries( protobuf pugixml opening_hours + icu ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${LIBZ} diff --git a/traffic/traffic_tests/CMakeLists.txt b/traffic/traffic_tests/CMakeLists.txt index 074ef8dff7..3c55ead1be 100644 --- a/traffic/traffic_tests/CMakeLists.txt +++ b/traffic/traffic_tests/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( base stats_client jansson + icu ${LIBZ} ) |