mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: try to find libdivecomputer on LGTM

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2019-03-16 09:07:30 -07:00
parent 7b1d5c5b8d
commit 2b5d818d35
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Modules/FindLibdivecomputer.cmake
View file

@ -22,6 +22,7 @@ HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/
/usr/local/include /usr/local/include
/usr/include /usr/include
/opt/out/include
) )
FIND_LIBRARY( LIBDIVECOMPUTER_LIBRARIES FIND_LIBRARY( LIBDIVECOMPUTER_LIBRARIES
@ -31,8 +32,9 @@ NAMES
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/
/usr/local/include /usr/local/lib
/usr/include /usr/lib
/opt/out/lib
) )
INCLUDE( FindPackageHandleStandardArgs ) INCLUDE( FindPackageHandleStandardArgs )