diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 19:21:55 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-13 19:21:55 +0200 |
| commit | 241919e7f7986c11586a49bff53cf19c2c0e0ea6 (patch) | |
| tree | dfd7f4fa971fd77c89eaaa140ba1e53b910b24aa /indra/cmake/PNG.cmake | |
| parent | 2c9ede0ccc3b6a27ca418fcb6e7a91eb87b261e9 (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/cmake/PNG.cmake')
| -rw-r--r-- | indra/cmake/PNG.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 819904b6bd..2838a6b667 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -1,15 +1,13 @@ # -*- cmake -*- include(Prebuilt) -if( TARGET libpng::libpng ) - return() -endif() -create_target(libpng::libpng) +include_guard() +create_target(ll::libpng) use_prebuilt_binary(libpng) if (WINDOWS) - set_target_libraries(libpng::libpng libpng16) + set_target_libraries(ll::libpng libpng16) else() - set_target_libraries(libpng::libpng png16 ) + set_target_libraries(ll::libpng png16 ) endif() -set_target_include_dirs( libpng::libpng ${LIBS_PREBUILT_DIR}/include/libpng16) +set_target_include_dirs( ll::libpng ${LIBS_PREBUILT_DIR}/include/libpng16) |