From 5936ced3119b44fab35a6af29339e54feb08e8ff Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 15 Dec 2010 21:23:03 +0100
Subject: [PATCH] SNOW-240: Fix libjson naming madness, again, for standalone.
SNOW-240 was actually about adding the whole search.
While this has been done, there is one issue left:
On linux (and remember, all of this is about standalone)
the libjson packages of distributions don't have this
complex compiler version baked into their name.
See also the last comment on SNOW-240:
https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305
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.
---
doc/contributions.txt | 1 +
indra/cmake/FindJsonCpp.cmake | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b6bdc36d460..35a82569004 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -61,6 +61,7 @@ Aimee Trescothick
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
+ SNOW-240
SNOW-522
SNOW-626
SNOW-756
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake
index 9d16f2aaabc..cf84b309c1f 100644
--- a/indra/cmake/FindJsonCpp.cmake
+++ b/indra/cmake/FindJsonCpp.cmake
@@ -21,7 +21,12 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
OUTPUT_STRIP_TRAILING_WHITESPACE
)
+# Try to find a library that was compiled with the same compiler version as we currently use.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
+IF (STANDALONE)
+ # On standalone, assume that the system installed library was compiled with the used compiler.
+ SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
+ENDIF (STANDALONE)
FIND_LIBRARY(JSONCPP_LIBRARY
NAMES ${JSONCPP_NAMES}
PATHS /usr/lib /usr/local/lib
--
GitLab