From 73ca4eac149f24db26e5f412aca30a8d8ffe7fa6 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 13 Aug 2010 18:34:35 +0100
Subject: [PATCH] Reintroduce check for LLKDU source after downloading the
prebuilt lib, to avoid adding a build dependency on it.
---
indra/cmake/LLKDU.cmake | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index b6943e7007d..fbe410c25fe 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -3,16 +3,18 @@ include(Prebuilt)
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(kdu)
- if (WINDOWS)
- set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
- else (WINDOWS)
- set(KDU_LIBRARY kdu)
- endif (WINDOWS)
+ 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(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})
+ 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)
endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
--
GitLab