summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-13 19:21:55 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-13 19:21:55 +0200
commit241919e7f7986c11586a49bff53cf19c2c0e0ea6 (patch)
treedfd7f4fa971fd77c89eaaa140ba1e53b910b24aa /indra/llimage
parent2c9ede0ccc3b6a27ca418fcb6e7a91eb87b261e9 (diff)
Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/CMakeLists.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 5387a22601..7b3c1110a2 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -62,9 +62,8 @@ target_link_libraries(llimage
llfilesystem
llmath
llcommon
- zlib-ng::zlib-ng
- libpng::libpng
- jpeglib::jpeglib
+ ll::libpng
+ ll::jpeglib
)
# Add tests