aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/ViewerMiscLibs.cmake
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-11-12 20:29:33 -0700
committerMcCabe Maxsted2010-11-12 20:29:33 -0700
commit7ada43ada084f347648afa7bd5bec362ee04db54 (patch)
tree7550bb1856b26133251cd0d575de84ef73489351 /linden/indra/cmake/ViewerMiscLibs.cmake
parentMerge remote branch 'nickyp/weekly' into weekly (diff)
downloadmeta-impy-7ada43ada084f347648afa7bd5bec362ee04db54.zip
meta-impy-7ada43ada084f347648afa7bd5bec362ee04db54.tar.gz
meta-impy-7ada43ada084f347648afa7bd5bec362ee04db54.tar.bz2
meta-impy-7ada43ada084f347648afa7bd5bec362ee04db54.tar.xz
Fixed fontconfig library not being set for Linux-only
Diffstat (limited to 'linden/indra/cmake/ViewerMiscLibs.cmake')
-rw-r--r--linden/indra/cmake/ViewerMiscLibs.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 35f4e3a..38d0444 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,10 +4,12 @@ include(Prebuilt)
4if (NOT STANDALONE) 4if (NOT STANDALONE)
5 use_prebuilt_binary(libuuid) 5 use_prebuilt_binary(libuuid)
6 use_prebuilt_binary(vivox) 6 use_prebuilt_binary(vivox)
7 if(LINUX AND ${ARCH} STREQUAL "x86_64") 7 if(LINUX)
8 if (${ARCH} STREQUAL "x86_64")
8 use_prebuilt_binary(32bitcompatibilitylibs) 9 use_prebuilt_binary(32bitcompatibilitylibs)
9 endif(LINUX AND ${ARCH} STREQUAL "x86_64") 10 endif (${ARCH} STREQUAL "x86_64")
10 use_prebuilt_binary(fontconfig) 11 use_prebuilt_binary(fontconfig)
12 endif(LINUX)
11else (NOT STANDALONE) 13else (NOT STANDALONE)
12 # Download there even when using standalone. 14 # Download there even when using standalone.
13 set(STANDALONE OFF) 15 set(STANDALONE OFF)