From 6ace243a2a528ddb9443ccb6c4abc7228a558fc2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 22 Apr 2015 18:35:18 -0300 Subject: Don't deppend on CMake to find the right libraries. We are compilling those libraries and we know where they are, so pass the directories and the libraries in a go directly. CMake was a bit random when choosing the correct ones, this way we are sure we got them. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- scripts/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 2ab97255a..d828858b6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -114,6 +114,13 @@ fi cd $SRC/subsurface mkdir -p build cd build -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. +cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. \ + -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include \ + -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.dylib \ + -DLIBDIVECOMPUTER_INCLUDE_DIR=$INSTALL_ROOT/include \ + -DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \ + -DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \ + -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.dylib + make -j4 make install -- cgit v1.2.3-70-g09d2