summaryrefslogtreecommitdiff
path: root/indra/cmake/ViewerMiscLibs.cmake
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-02 11:53:42 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-02 11:53:42 -0400
commit86d33e21a73e1f9db5b88b7169e32070c488bb48 (patch)
tree6c09925f34719c43c543dc23c8095af7a2c392d9 /indra/cmake/ViewerMiscLibs.cmake
parent22b1223ea7d68b27304cdd713f8e8b491b654060 (diff)
parentb7555a3309bda8e9689627901051aa90fcb7be34 (diff)
merge
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
-rw-r--r--indra/cmake/ViewerMiscLibs.cmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index df013b1665..5b00c989a4 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,15 +2,9 @@
include(Prebuilt)
if (NOT STANDALONE)
+ use_prebuilt_binary(libhunspell)
use_prebuilt_binary(libuuid)
use_prebuilt_binary(slvoice)
use_prebuilt_binary(fontconfig)
endif(NOT STANDALONE)
-if(VIEWER AND NOT STANDALONE)
- if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
- message(STATUS "We seem to have an artwork bundle in the tree - brilliant.")
- else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
- message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!")
- endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
-endif(VIEWER AND NOT STANDALONE)