diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-02-20 13:53:57 +0100 |
|---|---|---|
| committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-02-20 14:29:47 +0100 |
| commit | f9aa67a399b665ac665094e2d115f05bd55e9245 (patch) | |
| tree | 6cccc835a2c9c34e6a0bee5d0bf79a6bcb2f4306 | |
| parent | 818ab36b24cc0a116ac81954fb137e0bacc8b82e (diff) | |
| download | subsurface-f9aa67a399b665ac665094e2d115f05bd55e9245.tar.gz | |
Build system: correctly find libdivecomputer includes
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>
| -rw-r--r-- | cmake/Modules/FindLibdivecomputer.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake index 1ab0fc5dc..c9cb4ce80 100644 --- a/cmake/Modules/FindLibdivecomputer.cmake +++ b/cmake/Modules/FindLibdivecomputer.cmake @@ -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/ |