organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

fix linkage with freetype/icu twice on linux #1877

Merged
vng merged 3 commits from vng-fixodr into master 2022-01-20 06:32:13 +00:00
Conversation 6 Commits 3 Files changed 16 +69 -40

3 commits

Author SHA1 Message Date
Viktor Govako
81204300b8 [linux] Do not call u_setDataDirectory for Linux. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2022-01-19 22:18:44 +03:00
Viktor Govako
10e2db4782 Minor code prettify. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2022-01-19 22:18:44 +03:00
Viktor Govako
12f4f102f3 [linux] Fix linkage with freetype/icu twice on linux 
On linux Qt library depend on icu and freetype,
so OMaps linked with freetype/icu twice:
- static libraries 3rdparty/icu|freetype
- dynamic dependencies from libQtCore/libQtWidgets

this is undefined behavior because of one-definition-rule violation
comment #395

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
Signed-off-by: Evgeniy A. Dushistov <dushistov@mail.ru>
 2022-01-19 22:18:44 +03:00