Merge pull request #443 from phatblat/ben/pr/libgit2-build

Fix libgit2 build scripts
libgit2 · Feb 18, 2015 · 5053a93 · 5053a93
2 parents 2316a61 + 5ba578a
commit 5053a93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/script/update_libgit2 b/script/update_libgit2
@@ -22,7 +22,11 @@ fi
 mkdir build
 cd build
 
-cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_CLAR:BOOL=OFF -DTHREADSAFE:BOOL=ON ..
+cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
+	-DLIBSSH2_INCLUDE_DIR:PATH=/usr/local/include/ \
+	-DBUILD_CLAR:BOOL=OFF \
+	-DTHREADSAFE:BOOL=ON \
+	..
 cmake --build .
 
 product="libgit2.a"

diff --git a/script/update_libgit2_ios b/script/update_libgit2_ios
@@ -47,7 +47,7 @@ function build_libgit2 ()
         -DBUILD_SHARED_LIBS:BOOL=OFF \
         -DOPENSSL_INCLUDE_DIR:PATH=../../External/ios-openssl/include/ \
         -DCMAKE_LIBRARY_PATH:PATH=../../External/libssh2-ios/lib/ \
-        -DCMAKE_INCLUDE_PATH:PATH=../../External/libssh2-ios/include/libssh2/ \
+        -DLIBSSH2_INCLUDE_DIR:PATH=../../External/libssh2-ios/include/libssh2/ \
         -DOPENSSL_SSL_LIBRARY:FILEPATH=../../External/ios-openssl/lib/libssl.a \
         -DCMAKE_LIBRARY_PATH:PATH="${SDKROOT}/usr/lib/" \
         -DOPENSSL_CRYPTO_LIBRARY:FILEPATH=../../External/ios-openssl/lib/libcrypto.a \