diff options
| author |   Marcus Müller <mmueller@gnuradio.org> | 2019-09-29 19:35:38 +0200 |
|---|---|---|
| committer | Marcus Müller <mmueller@gnuradio.org> | 2019-09-29 19:36:03 +0200 |
| commit | feb5037411440c23f89bc40a2112ef75db70a1fd (patch) | |
| tree | 32573a838b95243d91f30dc1516494c7434b3619 | |
| parent | Update log4cpp cmake module to search in lib64 directories. (diff) | |
| download | gnuradio-feb5037411440c23f89bc40a2112ef75db70a1fd.tar.xz gnuradio-feb5037411440c23f89bc40a2112ef75db70a1fd.zip | |
FindLOG4CPP: canonical path ordering
That means:
* /usr first,
* /usr/local second,
* /opt only as testament to the fact that there's hilariously
non-standard installations.
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | cmake/Modules/FindLOG4CPP.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake index b28d734f4..3c1f2bdc5 100644 --- a/cmake/Modules/FindLOG4CPP.cmake +++ b/cmake/Modules/FindLOG4CPP.cmake @@ -12,15 +12,15 @@ if (LOG4CPP_INCLUDE_DIR) endif () find_path(LOG4CPP_INCLUDE_DIR log4cpp/Category.hh - /opt/local/include - /usr/local/include /usr/include + /usr/local/include + /opt/local/include ) set(LOG4CPP_NAMES log4cpp) find_library(LOG4CPP_LIBRARY NAMES ${LOG4CPP_NAMES} - PATHS /usr/lib /usr/local/lib /opt/local/lib /usr/lib64 /usr/local/lib64 + PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 /opt/local/lib /opt/local/lib64 ) |