diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
| commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
| tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/cmake/ZLIB.cmake | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge
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) |