diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
| commit | edec2d0559905d33907380d0b304b9e28f74082e (patch) | |
| tree | 8f66c497878a24b488039f54b04f03960fbb6c96 /indra/cmake/ZLIB.cmake | |
| parent | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/cmake/ZLIB.cmake')
| -rwxr-xr-x | indra/cmake/ZLIB.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 48e5130ad5..b99a8644c9 100755 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -5,9 +5,9 @@ set(ZLIB_FIND_REQUIRED ON) include(Prebuilt) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindZLIB) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(zlib) if (WINDOWS) set(ZLIB_LIBRARIES @@ -19,4 +19,4 @@ else (STANDALONE) if (WINDOWS OR LINUX) set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) endif (WINDOWS OR LINUX) -endif (STANDALONE) +endif (USESYSTEMLIBS) |