diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-04-02 09:20:34 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@verizonmedia.com> | 2019-04-02 09:22:43 +0000 |
| commit | c178d8a19da04a7bc8e3e2a13f373fdda27197bc (patch) | |
| tree | 1e55de690b6ce5f39c7339e5297c46f736ed16ac /bootstrap-cmake.sh | |
| parent | da41894e5b4f7525ee59d9c69838bdc21735d0f2 (diff) | |
Simplify link and include directories now that 3rd-party deps are installed in /opt/vespa-deps.
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x | bootstrap-cmake.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index b62bf617c1c..8f6bf953e6f 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -54,9 +54,9 @@ cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -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" \ - -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" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ + -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-deps/lib64;/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 \ |