diff options
| author | Michael Kruse <llvm@meinersbur.de> | 2017-07-18 10:09:53 +0000 |
|---|---|---|
| committer | Michael Kruse <llvm@meinersbur.de> | 2017-07-18 10:09:53 +0000 |
| commit | 8ab686944700ac7c26511b25a95146e43c8f6c1f (patch) | |
| tree | 6b35de6f073a69f0748977a1c205000fde6bf446 /polly/cmake | |
| parent | 8d0fc91adc1b833437b83e7063f7a2591014fd2b (diff) | |
| download | bcm5719-llvm-8ab686944700ac7c26511b25a95146e43c8f6c1f.tar.gz bcm5719-llvm-8ab686944700ac7c26511b25a95146e43c8f6c1f.zip | |
[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
Diffstat (limited to 'polly/cmake')
| -rw-r--r-- | polly/cmake/FindJsoncpp.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/polly/cmake/FindJsoncpp.cmake b/polly/cmake/FindJsoncpp.cmake index 9e1858ad3c1..47ff9585d50 100644 --- a/polly/cmake/FindJsoncpp.cmake +++ b/polly/cmake/FindJsoncpp.cmake @@ -7,7 +7,6 @@ if (PkgConfig_FOUND) foreach (libname IN LISTS JSONCPP_LIBRARIES) find_library(lib NAMES ${libname} HINTS ${JSONCPP_LIBDIR} ${JSONCPP_LIBRARY_DIRS} - NO_DEFAULT_PATH ) if (lib) list(APPEND fulllibs ${lib}) |
