summaryrefslogtreecommitdiff
path: root/indra/llcommon/CMakeLists.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 08:08:12 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 08:08:12 -0400
commit7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch)
treefac07085cf1b416ef3fb240961913758ebf6b435 /indra/llcommon/CMakeLists.txt
parentf64a20ddcff91677b02b7688e08819cffb0989c9 (diff)
parent28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff)
merge out 2.6.0 changes from viewer-development
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
-rw-r--r--indra/llcommon/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 9342a22d46..6439ac3349 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -12,6 +12,7 @@ include(LLSharedLibs)
include(GoogleBreakpad)
include(GooglePerfTools)
include(Copy3rdPartyLibs)
+include(ZLIB)
include_directories(
${EXPAT_INCLUDE_DIRS}