aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/ZLIB.cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/cmake/ZLIB.cmake
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/ZLIB.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 80d4191..48e5130 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -10,11 +10,13 @@ if (STANDALONE)
10else (STANDALONE) 10else (STANDALONE)
11 use_prebuilt_binary(zlib) 11 use_prebuilt_binary(zlib)
12 if (WINDOWS) 12 if (WINDOWS)
13 set(ZLIB_LIBRARIES zlib) 13 set(ZLIB_LIBRARIES
14 debug zlibd
15 optimized zlib)
14 else (WINDOWS) 16 else (WINDOWS)
15 set(ZLIB_LIBRARIES z) 17 set(ZLIB_LIBRARIES z)
16 endif (WINDOWS) 18 endif (WINDOWS)
17 if (WINDOWS OR LINUX) 19 if (WINDOWS OR LINUX)
18 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib) 20 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
19 endif (WINDOWS OR LINUX) 21 endif (WINDOWS OR LINUX)
20endif (STANDALONE) 22endif (STANDALONE)