From 2b5d818d354e6602a7cdd7f8203c6f6baa356cf9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 16 Mar 2019 09:07:30 -0700 Subject: [PATCH] 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 --- cmake/Modules/FindLibdivecomputer.cmake | 6 ++++-- 1 file 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 )