diff options
| author |  Tomaz Canabrava <tomazcanabrava@Tomazs-MacBook-Pro.local> | 2015-04-22 18:35:18 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-04-26 12:17:12 -0700 |
| commit | 6ace243a2a528ddb9443ccb6c4abc7228a558fc2 (patch) | |
| tree | 3d749627843e541390ac8e2f18973ac7038218df /scripts | |
| parent | c7c9b0155ff01b7d94b3604574ca54ac9e0d4125 (diff) | |
| download | subsurface-6ace243a2a528ddb9443ccb6c4abc7228a558fc2.tar.gz | |
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 <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 9 |
1 files changed, 8 insertions, 1 deletions
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 |