diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-01 23:32:44 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-01 23:32:44 +0000 |
| commit | 460d01befb6bfc3bc956589065362118f52610c0 (patch) | |
| tree | 47a261ffb136053ce68a74f4b4cb7e759be8af26 /indra/cmake | |
| parent | a09d1503bc150ca6f9e5650f85f2071613786253 (diff) | |
Update build plumbing with tier 2, 3 and 4 libraries
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/PNG.cmake | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 44c2d3ac27..308e378db0 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -286,7 +286,7 @@ elseif(LINUX) libuuid.so.16 libuuid.so.16.0.22 libssl.so.1.0.0 - libfontconfig.so.1.4.4 + libfontconfig.so.1.8.0 ) if (USE_TCMALLOC) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 913c575672..d9afe772ae 100755 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -9,13 +9,13 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(libpng) if (WINDOWS) - set(PNG_LIBRARIES libpng15) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + set(PNG_LIBRARIES libpng16) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) elseif(DARWIN) - set(PNG_LIBRARIES png15) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + set(PNG_LIBRARIES png16) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) else() - set(PNG_LIBRARIES png15) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15) + set(PNG_LIBRARIES png16) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) endif() endif (STANDALONE) |