diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
| commit | d00d37d23b68037fed8eeeffe21a87f7597086c3 (patch) | |
| tree | 2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/cmake/JPEG.cmake | |
| parent | 6c8bddca3d5a790934535fdd6f176e28d181d76a (diff) | |
| parent | 776aadf4ef65681084268c3866058172c89b4259 (diff) | |
merge changes for OPEN-199
Diffstat (limited to 'indra/cmake/JPEG.cmake')
| -rwxr-xr-x | indra/cmake/JPEG.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 4f99efd602..d6da22aecc 100755 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -5,9 +5,9 @@ include(Linking) set(JPEG_FIND_QUIETLY ON) set(JPEG_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindJPEG) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(jpeglib) if (LINUX) set(JPEG_LIBRARIES jpeg) @@ -17,4 +17,4 @@ else (STANDALONE) set(JPEG_LIBRARIES jpeglib) endif (LINUX) set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) -endif (STANDALONE) +endif (USESYSTEMLIBS) |