From b01c75cb423f07a3d3354f8bd62f265f80062b3b Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 16 Apr 2009 23:45:35 +0000 Subject: svn merge -r117314:117337 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge --- indra/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index d19811586f..7f4c2c33c1 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -50,9 +50,9 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs) add_subdirectory(${LIBS_OPEN_PREFIX}llwindow) add_subdirectory(${LIBS_OPEN_PREFIX}llxml) -if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) +if (EXISTS ${LIBS_CLOSED_DIR}llkdu) add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu) -endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) +endif (EXISTS ${LIBS_CLOSED_DIR}llkdu) add_subdirectory(${LIBS_OPEN_PREFIX}lscript) -- cgit v1.2.3