diff options
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/ViewerMiscLibs.cmake | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 32c4bc81df..fc5bdedb5a 100644..100755 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -1,16 +1,12 @@ # -*- cmake -*- include(Prebuilt) -if (NOT STANDALONE) - use_prebuilt_binary(libuuid) - use_prebuilt_binary(vivox) - use_prebuilt_binary(fontconfig) -endif(NOT STANDALONE) +if (NOT USESYSTEMLIBS) + if (LINUX) + use_prebuilt_binary(libuuid) + use_prebuilt_binary(fontconfig) + endif (LINUX) + use_prebuilt_binary(libhunspell) + use_prebuilt_binary(slvoice) +endif(NOT USESYSTEMLIBS) -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) |