aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/PNG.cmake
diff options
context:
space:
mode:
authorJacek Antonelli2010-06-26 18:43:18 -0500
committerJacek Antonelli2010-06-26 19:01:38 -0500
commit3de0581adbb0d5d51a290ba75d0e27cdb1903b07 (patch)
tree30765ceecff14c2fcd0b8f18b8d62b2e7a64cbde /linden/indra/cmake/PNG.cmake
parentChanged version to Weekly 2010-06-26. (diff)
downloadmeta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.zip
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.gz
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.bz2
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.xz
Fixed cmake not finding Mac libxml2 and libpng12.
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/PNG.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/cmake/PNG.cmake b/linden/indra/cmake/PNG.cmake
index d08476d..23c3564 100644
--- a/linden/indra/cmake/PNG.cmake
+++ b/linden/indra/cmake/PNG.cmake
@@ -8,6 +8,10 @@ if (STANDALONE)
8 include(FindPNG) 8 include(FindPNG)
9else (STANDALONE) 9else (STANDALONE)
10 use_prebuilt_binary(libpng) 10 use_prebuilt_binary(libpng)
11 set(PNG_LIBRARIES png12) 11 if( DARWIN )
12 set(PNG_LIBRARIES png12.0)
13 else( DARWIN )
14 set(PNG_LIBRARIES png12)
15 endif (DARWIN)
12 set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) 16 set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
13endif (STANDALONE) 17endif (STANDALONE)