aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-04-07 16:13:27 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-07 16:27:39 -0700
commitc2bdc58fb8d9731fdbc3889017e8a7991da73ce9 (patch)
treedc20db7a4b2f9032f4b7d4ab8b74ed3bda7ae62f /cmake
parent6f935907053a6f2cc97b1fafed4a6896d40f6874 (diff)
downloadsubsurface-c2bdc58fb8d9731fdbc3889017e8a7991da73ce9.tar.gz
Make it compilant with the build script
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/FindLIBGIT2.cmake2
-rw-r--r--cmake/Modules/FindLibdivecomputer.cmake2
-rw-r--r--cmake/Modules/FindMarble.cmake2
3 files changed, 6 insertions, 0 deletions
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