From 435ec2cbc2d879b1f6b0fa00394846ddfbf9c7be Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 9 Apr 2015 15:00:52 -0700 Subject: build.sh: use "install-root" for our local install destination This seems less confusing then calling it just "install". Also adjust our cmake/Modules/Find... files accordingly. Signed-off-by: Dirk Hohndel --- cmake/Modules/FindLIBGIT2.cmake | 4 ++-- cmake/Modules/FindLibdivecomputer.cmake | 4 ++-- cmake/Modules/FindMarble.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindLIBGIT2.cmake b/cmake/Modules/FindLIBGIT2.cmake index b352665bb..6e1193f50 100644 --- a/cmake/Modules/FindLIBGIT2.cmake +++ b/cmake/Modules/FindLIBGIT2.cmake @@ -16,7 +16,7 @@ ENDIF () FIND_PATH( LIBGIT2_INCLUDE_DIR NAMES git2.h HINTS - ${CMAKE_CURRENT_SOURCE_DIR}/../install/include + ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include /usr/local/include /usr/include @@ -27,7 +27,7 @@ NAMES libgit2.a git2 HINTS - ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/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 d470cccdb..1ab0fc5dc 100644 --- a/cmake/Modules/FindLibdivecomputer.cmake +++ b/cmake/Modules/FindLibdivecomputer.cmake @@ -16,7 +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}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ /usr/local/include /usr/include @@ -27,7 +27,7 @@ NAMES libdivecomputer.a divecomputer HINTS - ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/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 4e167a6a2..b50aeca24 100644 --- a/cmake/Modules/FindMarble.cmake +++ b/cmake/Modules/FindMarble.cmake @@ -16,7 +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}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib /usr/local/include @@ -28,7 +28,7 @@ NAMES ssrfmarblewidget marblewidget HINTS - ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../marble ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source /usr/local/include -- cgit v1.2.3-70-g09d2