diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
| commit | 87a7eee21d986e2a1c8b5fd467b5da06112690b5 (patch) | |
| tree | 609741b2e3d0bfe72843342c19e67b7d78f602f4 /indra/cmake/ZLIB.cmake | |
| parent | cec79bdb29ac5438c9b9bb0312b4981116f17f61 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Sync merge with lindenlab/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) |