diff options
| author | AiraYumi <aira.youme@airanyumi.net> | 2024-03-30 06:59:21 -0400 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-01 10:43:59 +0300 |
| commit | 4173fa1a9ef79c27d39d9ab9dbee46f109fbf510 (patch) | |
| tree | eb630ddd7706c265e418a3c8611061fae6ed61fc /indra/cmake | |
| parent | cc68803f24d231b89061d855f7bbfe99b99740b9 (diff) | |
linux build fix
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 14 | ||||
| -rw-r--r-- | indra/cmake/ICU4C.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9f79c13a97..48930c1c19 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -225,14 +225,14 @@ elseif(LINUX) libapr-1.so.0 libaprutil-1.so.0 libatk-1.0.so - libfreetype.so.6.6.2 - libfreetype.so.6 + #libfreetype.so.6.6.2 + #libfreetype.so.6 libhunspell-1.3.so.0.0.0 - libopenjp2.so - libuuid.so.16 - libuuid.so.16.0.22 - libfontconfig.so.1.8.0 - libfontconfig.so.1 + #libopenjp2.so + #libuuid.so.16 + #libuuid.so.16.0.22 + #libfontconfig.so.1.8.0 + #libfontconfig.so.1 libgmodule-2.0.so libgobject-2.0.so ) diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake index 7b27665483..a9714696b4 100644 --- a/indra/cmake/ICU4C.cmake +++ b/indra/cmake/ICU4C.cmake @@ -12,8 +12,8 @@ if (WINDOWS) target_link_libraries( ll::icu4c INTERFACE icuuc) elseif(DARWIN) target_link_libraries( ll::icu4c INTERFACE icuuc) -#elseif(LINUX) -## target_link_libraries( ll::icu4c INTERFACE ) +elseif(LINUX) + target_link_libraries( ll::icu4c INTERFACE icuuc) else() message(FATAL_ERROR "Invalid platform") endif() diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index cae68fbc11..3e5a37b277 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -6,7 +6,8 @@ if (LINUX) add_library( ll::fontconfig INTERFACE IMPORTED ) if( NOT USE_CONAN ) - use_prebuilt_binary(fontconfig) + find_package(Fontconfig REQUIRED) + target_link_libraries( ll::fontconfig INTERFACE Fontconfig::Fontconfig ) else() target_link_libraries( ll::fontconfig INTERFACE CONAN_PKG::fontconfig ) endif() |