From e416840f85dc4a367894036b9fe483f17d959c54 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 24 Aug 2010 19:22:00 +0100 Subject: Backed out changeset c3d41f18ce2b back-out the back-out for this branch. yay. --- indra/cmake/ViewerMiscLibs.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 2a8abdac23..32c4bc81df 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -7,3 +7,10 @@ if (NOT STANDALONE) 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) -- cgit v1.2.3 From f6d0f9952b19c5a41a63accd3aa265b30d982853 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 24 Aug 2010 12:42:38 -0700 Subject: Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries references, fixed llkdu cmake to simply point to lib and build --- indra/cmake/LLKDU.cmake | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index fbe410c25f..27c8ada686 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -3,18 +3,5 @@ include(Prebuilt) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(kdu) - if (EXISTS ${LIBS_CLOSED_DIR}/llkdu) - if (WINDOWS) - set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - else (WINDOWS) - set(KDU_LIBRARY kdu) - endif (WINDOWS) - - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_STATIC_LIBRARY llkdu_static) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) - set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY}) - endif (EXISTS ${LIBS_CLOSED_DIR}/llkdu) + set(LLKDU_LIBRARY llkdu) endif (INSTALL_PROPRIETARY AND NOT STANDALONE) -- cgit v1.2.3