From c2bdc58fb8d9731fdbc3889017e8a7991da73ce9 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 7 Apr 2015 16:13:27 -0700 Subject: Make it compilant with the build script Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- cmake/Modules/FindLIBGIT2.cmake | 2 ++ cmake/Modules/FindLibdivecomputer.cmake | 2 ++ cmake/Modules/FindMarble.cmake | 2 ++ 3 files changed, 6 insertions(+) (limited to 'cmake/Modules') diff --git a/cmake/Modules/FindLIBGIT2.cmake b/cmake/Modules/FindLIBGIT2.cmake index 2d13f0bff..b352665bb 100644 --- a/cmake/Modules/FindLIBGIT2.cmake +++ b/cmake/Modules/FindLIBGIT2.cmake @@ -16,6 +16,7 @@ ENDIF () FIND_PATH( LIBGIT2_INCLUDE_DIR NAMES git2.h HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/include ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include /usr/local/include /usr/include @@ -26,6 +27,7 @@ NAMES libgit2.a git2 HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build /usr/local/include /usr/include diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake index 07e36f21f..d470cccdb 100644 --- a/cmake/Modules/FindLibdivecomputer.cmake +++ b/cmake/Modules/FindLibdivecomputer.cmake @@ -16,6 +16,7 @@ ENDIF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES ) FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR NAMES libdivecomputer/hw.h HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/include ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ /usr/local/include /usr/include @@ -26,6 +27,7 @@ NAMES libdivecomputer.a divecomputer HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ /usr/local/include /usr/include diff --git a/cmake/Modules/FindMarble.cmake b/cmake/Modules/FindMarble.cmake index aed73ffac..4e167a6a2 100644 --- a/cmake/Modules/FindMarble.cmake +++ b/cmake/Modules/FindMarble.cmake @@ -16,6 +16,7 @@ ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES ) FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/include ${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib /usr/local/include @@ -27,6 +28,7 @@ NAMES ssrfmarblewidget marblewidget HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source /usr/local/include -- cgit v1.2.3-70-g09d2