diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2008-06-12 20:51:41 +0000 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2008-06-12 20:51:41 +0000 |
| commit | fbf15572d905799257c07d1ddfb9dea0007e89fe (patch) | |
| tree | 090041496a28250356fab7806ff5c02d929a8169 /indra/cmake/ZLIB.cmake | |
| parent | 26a87de287544e923d08addcae4efd51125ac8c0 (diff) | |
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
Diffstat (limited to 'indra/cmake/ZLIB.cmake')
| -rw-r--r-- | indra/cmake/ZLIB.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 3740103a72..80d4191971 100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -3,13 +3,18 @@ set(ZLIB_FIND_QUIETLY ON) set(ZLIB_FIND_REQUIRED ON) +include(Prebuilt) + if (STANDALONE) include(FindZLIB) else (STANDALONE) + use_prebuilt_binary(zlib) if (WINDOWS) set(ZLIB_LIBRARIES zlib) else (WINDOWS) set(ZLIB_LIBRARIES z) endif (WINDOWS) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + if (WINDOWS OR LINUX) + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib) + endif (WINDOWS OR LINUX) endif (STANDALONE) |