aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/ZLIB.cmake
diff options
context:
space:
mode:
authorArmin Weatherwax2011-06-20 19:07:47 +0200
committerArmin Weatherwax2011-11-13 17:10:06 +0100
commit5c069f43e5776a7956daa5c26a86e9bf0389850b (patch)
treea58b112cbee426bad5556cad23dd61fd411197ea /linden/indra/cmake/ZLIB.cmake
parentlinux64 use gtk without libxml2 dependency (diff)
downloadmeta-impy-5c069f43e5776a7956daa5c26a86e9bf0389850b.zip
meta-impy-5c069f43e5776a7956daa5c26a86e9bf0389850b.tar.gz
meta-impy-5c069f43e5776a7956daa5c26a86e9bf0389850b.tar.bz2
meta-impy-5c069f43e5776a7956daa5c26a86e9bf0389850b.tar.xz
use qt/webkit 4.7.4 on linux
Diffstat (limited to 'linden/indra/cmake/ZLIB.cmake')
-rw-r--r--linden/indra/cmake/ZLIB.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 48e5130..8a16a0e 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -17,6 +17,10 @@ else (STANDALONE)
17 set(ZLIB_LIBRARIES z) 17 set(ZLIB_LIBRARIES z)
18 endif (WINDOWS) 18 endif (WINDOWS)
19 if (WINDOWS OR LINUX) 19 if (WINDOWS OR LINUX)
20 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) 20 if(LINUX AND ${ARCH} STREQUAL "x86_64")
21 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
22 else(LINUX AND ${ARCH} STREQUAL "x86_64")
23 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
24 endif(LINUX AND ${ARCH} STREQUAL "x86_64")
21 endif (WINDOWS OR LINUX) 25 endif (WINDOWS OR LINUX)
22endif (STANDALONE) 26endif (STANDALONE)