Commit Graph

5 Commits

Author SHA1 Message Date
Michael Kruse 6123cdce39 [CMake] FindJsoncpp.cmake: Use descriptive variable name for libjsoncpp.so path.
find_library(lib) stores the result in the variable "lib", which is also
cached in CMakeCache.txt.  This could theoretically conflict if jsoncpp
required two libraries, which each would get cached as "lib".  Use a
more descriptive and disambiguative "jsoncpp_${libname}" for that.

llvm-svn: 308289
2017-07-18 10:10:02 +00:00
Michael Kruse 50d7b290c3 [CMake] FindJsoncpp.cmake: Use foreach variable.
Use ${libname} instead of ${lib}. By a coincidence, this worked
because ${lib} also the variable used for finding the libjsoncpp.so
full path.

llvm-svn: 308288
2017-07-18 10:09:58 +00:00
Michael Kruse 8ab6869447 [CMake] FindJsoncpp.cmake: search pkg-config libs in default search paths.
pkg_search_module(JSONCPP) should set
JSONCPP_LIBDIR/JSONCPP_LIBRARY_DIRS to where the libjsoncpp.so can be
found. However, on Ubuntu 14.04 LTS (Trusty Tahr) it returns /usr/lib
while the libjsoncpp library can be found at
/usr/lib/x86_64-linux-gnu/libjsoncpp.so. Thus, while searching for
the full path of the jsoncpp library, it is not found.

JSONCPP_LIBDIR is correctly set to /usr/lib/x86_64-linux-gnu on e.g.,
Ubuntu 16.04 LTS (Xenial Xerus )

Fix by removing the NO_DEFAULT_PATH flag, in order to search the system
default paths even if the library is not found in
JSONCPP_LIBDIR/JSONCPP_LIBRARY_DIRS.

This fixes bug llvm.org/PR33798.

llvm-svn: 308287
2017-07-18 10:09:53 +00:00
NAKAMURA Takumi b49ca64b18 Test commit
llvm-svn: 306696
2017-06-29 16:35:38 +00:00
Michael Kruse 2a8f6f843f [CMake] Introduce POLLY_BUNDLED_JSONCPP.
Allow using a system's install jsoncpp library instead of the bundled
one with the setting POLLY_BUNDLED_JSONCPP=OFF.

This fixes llvm.org/PR32929

Differential Revision: https://reviews.llvm.org/D32922

llvm-svn: 302336
2017-05-06 13:42:15 +00:00