diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-24 13:29:00 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-24 13:29:00 +0100 |
| commit | 7ca2dfc18aa3d968a67a1f795b8a0c56b43c5d93 (patch) | |
| tree | 56c4abb7a7d15f040571c4239674e63a56a8ce26 /bootstrap-cmake.sh | |
| parent | 1daf8584286b68e423e212bb2769e8ffaf2911ca (diff) | |
Use /opt/vespa-deps prefix.
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x | bootstrap-cmake.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index df6f53e8ae5..7c38af41b5d 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -50,9 +50,10 @@ fi cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib64;/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="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-gtest/lib64;/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_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" \ + -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-deps/lib64;/opt/vespa-gtest/lib64;/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 \ |