diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:15:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:15:48 -0400 |
| commit | 572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch) | |
| tree | 4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/cmake/PNG.cmake | |
| parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
| parent | b49446c863644d603ec2e1f86f12d24b1c4375c2 (diff) | |
pull back tags from viewer-release
Diffstat (limited to 'indra/cmake/PNG.cmake')
| -rw-r--r-- | indra/cmake/PNG.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f6522d9e2f..913c575672 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,6 +8,14 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) + if (WINDOWS) + set(PNG_LIBRARIES libpng15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + elseif(DARWIN) + set(PNG_LIBRARIES png15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + else() + set(PNG_LIBRARIES png15) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + endif() endif (STANDALONE) |