diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2019-02-18 15:27:15 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2019-02-18 15:31:01 +0100 |
| commit | 91ce0568bea8db71e167b3de8b5e9f7416f5126b (patch) | |
| tree | 56569d0b12725508cadb05d74bff87f7efd3527c /bootstrap-cmake.sh | |
| parent | 5a02c735a598ec0b4a93e5b99cb618a23425d5f9 (diff) | |
Use vespa-gtest 1.8.1.
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x | bootstrap-cmake.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index b484d41e8b6..df6f53e8ae5 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -50,9 +50,9 @@ fi cmake3 \ -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_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/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/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 \ |