From f9aa67a399b665ac665094e2d115f05bd55e9245 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Tue, 20 Feb 2018 13:53:57 +0100 Subject: 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 --- cmake/Modules/FindLibdivecomputer.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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/ -- cgit v1.2.3-70-g09d2