diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-16 09:07:30 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-03-16 20:24:04 -0700 |
| commit | 2b5d818d354e6602a7cdd7f8203c6f6baa356cf9 (patch) | |
| tree | d8002092afe64f964fba0b909c6583c8a0f4e5b2 | |
| parent | 7b1d5c5b8dd5ea000918333330b8e034b3b60160 (diff) | |
| download | subsurface-2b5d818d354e6602a7cdd7f8203c6f6baa356cf9.tar.gz | |
build-system: try to find libdivecomputer on LGTM
On LGTM we end up installing in /opt/out.
Also, fix a silly error in the existing code - don't look for libraries in
include directories.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | cmake/Modules/FindLibdivecomputer.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake index c9cb4ce80..60c20ebc1 100644 --- a/cmake/Modules/FindLibdivecomputer.cmake +++ b/cmake/Modules/FindLibdivecomputer.cmake @@ -22,6 +22,7 @@ HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ /usr/local/include /usr/include + /opt/out/include ) FIND_LIBRARY( LIBDIVECOMPUTER_LIBRARIES @@ -31,8 +32,9 @@ NAMES HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ - /usr/local/include - /usr/include + /usr/local/lib + /usr/lib + /opt/out/lib ) INCLUDE( FindPackageHandleStandardArgs ) |