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

Build system: correctly find libdivecomputer includes

Browse source 
Fully unsure when this got broken, but we tried to find the
libdivecomputer includes based on the include file "hw.h".
Interestingly, that file does not exisist (any more?) in
libdivecomputer, so the search for the include fails. This
is annoying, as the initial cmake fails on this in case of
developer builds from QtCreator (which do not compile all
dependencies like our home grown build scripts).

The solution is simple: just find the includes for
libdivecomputer based on exiting files in this lib.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-02-20 13:53:57 +01:00
parent 818ab36b24
commit f9aa67a399
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/Modules/FindLibdivecomputer.cmake
View file

@ -14,7 +14,9 @@ IF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
ENDIF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR
NAMES libdivecomputer/hw.h
NAMES
libdivecomputer/device.h
libdivecomputer/descriptor.h
HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/