diff options
author | Jacek Antonelli | 2010-06-26 18:43:18 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-06-26 19:01:38 -0500 |
commit | 3de0581adbb0d5d51a290ba75d0e27cdb1903b07 (patch) | |
tree | 30765ceecff14c2fcd0b8f18b8d62b2e7a64cbde /linden/indra/cmake/PNG.cmake | |
parent | Changed version to Weekly 2010-06-26. (diff) | |
download | meta-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.cmake | 6 |
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) |
9 | else (STANDALONE) | 9 | else (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) |
13 | endif (STANDALONE) | 17 | endif (STANDALONE) |