summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-04-17 20:39:07 +0000
committerJames Cook <james@lindenlab.com>2009-04-17 20:39:07 +0000
commit57b47705d7a4a2927ac7329bd2b5b37c1c1c5115 (patch)
treeaf98d6cbc7b5918ee8bd2afda1ff8487cef603d7 /indra/llimage
parentb01c75cb423f07a3d3354f8bd62f265f80062b3b (diff)
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
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
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}