----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://codereview.secondlife.com/r/47/#review54 -----------------------------------------------------------
Ship it! Looks good. Like this, it should continue working even if a system-wide installed libjson uses the compiler-version-specific filename, like the gentoo ebuild from Techwolf's portage overlay currently does. I guess all other distributions use the plain name, so once this ebuild has been updated, we can even drop looking for the compiler version specific filename in the standalone case completely. - Boroondas On 2010-12-19 09:19:37, Aleric Inglewood wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://codereview.secondlife.com/r/47/ > ----------------------------------------------------------- > > (Updated 2010-12-19 09:19:37) > > > Review request for Viewer. > > > Summary > ------- > > On linux (and remember this is about standalone) > the libjson packages of distributions don't have this > complex compiler version baked into their name. > > This patch fixes this issue by first searching for > libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so > and when that fails search for the system package > library file libjson.so. > > > This addresses bug SNOW-240. > http://jira.secondlife.com/browse/SNOW-240 > > > Diffs > ----- > > indra/cmake/FindJsonCpp.cmake b0689af42a71 > > Diff: http://codereview.secondlife.com/r/47/diff > > > Testing > ------- > > It works :p (I have Michelle's debian package libjsoncpp0 installed, which > provides /usr/lib/libjson.so). > > > Thanks, > > Aleric > >
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
