From 9b2d9c6e6e43f5600be64c65e42c373a199a3e1d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 20 Apr 2009 16:24:21 +0000
Subject: Retry.  Build system fixes for library-library dependencies, ported
 from skinning-7.  OK by CG. svn merge -r117623:117624
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7

---
 indra/llimage/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/llimage')

diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 1a4d92bc34..a155d19407 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -49,8 +49,11 @@ set_source_files_properties(${llimage_HEADER_FILES}
 list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
 
 add_library (llimage ${llimage_SOURCE_FILES})
-target_link_libraries(
-    llimage
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llimage
+    llcommon
+    llimagej2coj        # *HACK: In theory a noop for KDU builds?
     ${JPEG_LIBRARIES}
     ${PNG_LIBRARIES}
     ${ZLIB_LIBRARIES}
-- 
cgit v1.2.3