summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2023-01-25 20:31:04 +0100
committerKitty Barnett <develop@catznip.com>2023-01-25 20:31:04 +0100
commitda0335c864477036ba996fbab4db2194535466d7 (patch)
treedea8460c8ab32c3dbe2e285cbd10c36ddc81b5be /indra/newview
parent5dcdf8330409779591d35c05888efd02e412cf50 (diff)
Fix Mac build
- Link against ICU4C - Font files were only copied on Windows builds - Replace missing variable
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 36f4680c44..bca8e98c87 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1506,12 +1506,6 @@ if (WINDOWS)
set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
endif(USE_PRECOMPILED_HEADERS)
- message("Copying fonts")
- file(GLOB FONT_FILE_GLOB_LIST
- "${AUTOBUILD_INSTALL_DIR}/fonts/*"
- )
- file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
-
# Replace the icons with the appropriate ones for the channel
# ('test' is the default)
set(ICON_PATH "test")
@@ -2087,6 +2081,12 @@ endif (USE_BUGSPLAT)
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
"Path to artwork files.")
+message("Copying fonts")
+file(GLOB FONT_FILE_GLOB_LIST
+ "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+)
+file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+
if (LINUX)
set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})