diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-03-02 08:55:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-03-02 08:55:04 +0800 |
| commit | 64a181fdde219328560eee0ff5b87f02ba36a65f (patch) | |
| tree | 285437f75513ef47639ee9f3f8d47a5dc1b0ef8c /indra/cmake | |
| parent | 60592ae0d7a98e071e516fcac70c5bf1427f20be (diff) | |
| parent | 1204468415dd5248bbd01d7aaede520ede3b9d36 (diff) | |
Merge tag '7.1.3-release'
source for viewer 7.1.3.7878383867
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 9 | ||||
| -rw-r--r-- | indra/cmake/ICU4C.cmake | 31 | ||||
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 4 |
4 files changed, 45 insertions, 2 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 1fd83eadff..05c51c018d 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -30,6 +30,7 @@ set(cmake_SOURCE_FILES GoogleMock.cmake Havok.cmake Hunspell.cmake + ICU4C.cmake JsonCpp.cmake LLAddBuildTest.cmake LLAppearance.cmake @@ -64,7 +65,7 @@ set(cmake_SOURCE_FILES VisualLeakDetector.cmake LibVLCPlugin.cmake XmlRpcEpi.cmake - xxHash.cmake + xxHash.cmake ZLIBNG.cmake ) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 7938d4f54b..9f79c13a97 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -62,6 +62,15 @@ if(WINDOWS) uriparser.dll ) + # ICU4C (same filenames for 32 and 64 bit builds) + set(release_files ${release_files} icudt48.dll) + set(release_files ${release_files} icuin48.dll) + set(release_files ${release_files} icuio48.dll) + set(release_files ${release_files} icule48.dll) + set(release_files ${release_files} iculx48.dll) + set(release_files ${release_files} icutu48.dll) + set(release_files ${release_files} icuuc48.dll) + # OpenSSL if(ADDRESS_SIZE EQUAL 64) set(release_files ${release_files} libcrypto-1_1-x64.dll) diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake new file mode 100644 index 0000000000..f4b2a5d85f --- /dev/null +++ b/indra/cmake/ICU4C.cmake @@ -0,0 +1,31 @@ +# -*- cmake -*- +include(Prebuilt) + +include_guard() + +add_library( ll::icu4c INTERFACE IMPORTED ) + +if (USESYSTEMLIBS) + include(FindPkgConfig) + pkg_check_modules(Icuuc REQUIRED icu-uc) + target_include_directories(ll::icu4c SYSTEM INTERFACE ${Icuuc_INCLUDE_DIRS}) + target_link_directories(ll::icu4c INTERFACE ${Icuuc_LIBRARY_DIRS}) + target_link_libraries(ll::icu4c INTERFACE ${Icuuc_LIBRARIES}) + return () +endif () + +use_system_binary(icu4c) +use_prebuilt_binary(icu4c) +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 ) +else() + message(FATAL_ERROR "Invalid platform") +endif() + +target_include_directories( ll::icu4c SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/unicode ) + +use_prebuilt_binary(dictionaries) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 52128414c9..04a4c72d5f 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -4,7 +4,6 @@ include(Prebuilt) if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) add_library( ll::fontconfig INTERFACE IMPORTED ) use_system_binary(fontconfig) - return () endif () if (LINUX) @@ -24,3 +23,6 @@ endif() use_prebuilt_binary(slvoice) +use_prebuilt_binary(nanosvg) +use_prebuilt_binary(viewer-fonts) +use_prebuilt_binary(emoji_shortcodes) |