diff options
| author | Geir Storli <geirst@oath.com> | 2018-09-17 09:15:57 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@oath.com> | 2018-09-17 09:15:57 +0000 |
| commit | 483f01297240b5cc3f28eb103340d9fb879f15b4 (patch) | |
| tree | efe0002b9cc01173945ee08393fefbfec58b17f7 /bootstrap-cmake.sh | |
| parent | 67ecb882ec22420dab988f7a58e55aece081dbd3 (diff) | |
Reduce duplication in cmake command args.
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x | bootstrap-cmake.sh | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index fd2b3322f1c..b484d41e8b6 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -40,25 +40,20 @@ if [ -z "$VESPA_LLVM_VERSION" ]; then fi if $UNPRIVILEGED; then -cmake3 \ - -DCMAKE_INSTALL_PREFIX=$HOME/vespa \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ - -DCMAKE_INSTALL_RPATH="$HOME/vespa/lib64;/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ - -DVESPA_USER=$(id -un) \ - -DVESPA_UNPRIVILEGED=yes \ - ${EXTRA_CMAKE_ARGS} \ - -DVESPA_LLVM_VERSION=$VESPA_LLVM_VERSION \ - "${SOURCE_DIR}" + VESPA_INSTALL_PREFIX="$HOME/vespa" + UNPRIVILEGED_ARGS="-DVESPA_USER=$(id -un) -DVESPA_UNPRIVILEGED=yes" else + VESPA_INSTALL_PREFIX="/opt/vespa" + UNPRIVILEGED_ARGS="" +fi + cmake3 \ - -DCMAKE_INSTALL_PREFIX=/opt/vespa \ + -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + ${UNPRIVILEGED_ARGS} \ ${EXTRA_CMAKE_ARGS} \ -DVESPA_LLVM_VERSION=$VESPA_LLVM_VERSION \ "${SOURCE_DIR}" -fi |