diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-03-28 00:09:19 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-03-28 00:09:19 +0100 |
| commit | bddd1f9498cd5ab9fac502f4e244298966f10517 (patch) | |
| tree | e7c077d4f79d8c6e4f51e05a07bf42a8281804eb /bootstrap-cmake.sh | |
| parent | 5e33bb54604989bb2cef605572f7750d45eb630a (diff) | |
Pass through JAVA_HOME if set
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x | bootstrap-cmake.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index 7c38af41b5d..b62bf617c1c 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -23,7 +23,10 @@ while getopts "uh" opt; do done shift $((OPTIND-1)) -if [[ $# -eq 1 ]]; then +if [[ $# -eq 0 ]]; then + SOURCE_DIR=$(dirname "$0") + EXTRA_CMAKE_ARGS="" +elif [[ $# -eq 1 ]]; then SOURCE_DIR=$1 EXTRA_CMAKE_ARGS="" elif [ $# -eq 2 ]; then @@ -49,7 +52,7 @@ fi cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ + -DJAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-openjdk} \ -DCMAKE_PREFIX_PATH="/opt/vespa-deps" \ -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/opt/vespa-gtest/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ |