From 4a768d8e15135beaf7b51e1122231cdcb0944aee Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 23 Aug 2014 00:28:46 +0200 Subject: [PATCH] Proper copy target for Linux x64 libpng. --- indra/cmake/Copy3rdPartyLibs.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index eb0ea92ff5..7c56bb6995 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -332,11 +332,23 @@ elseif(LINUX) libuuid.so.16.0.22 libssl.so.1.0.0 libfontconfig.so.1.4.4 - libpng15.so.15 - libpng15.so.15.13.0 +# libpng15.so.15 +# libpng15.so.15.13.0 #libnotify.so # *TODO test/fix/get linux libnotify(growl) ) + if( NOT ND_BUILD64BIT_ARCH ) + set(release_files ${release_files} + libpng15.so.15 + libpng15.so.15.13.0 + ) + else( NOT ND_BUILD64BIT_ARCH ) + set(release_files ${release_files} + libpng15.so.15 + libpng15.so.15.1.0 + ) + endif( NOT ND_BUILD64BIT_ARCH ) + if (USE_TCMALLOC) set(release_files ${release_files} "libtcmalloc_minimal.so") endif (USE_TCMALLOC)