diff options
| author | Arnstein Ressem <aressem@oath.com> | 2018-05-11 14:25:15 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@oath.com> | 2018-05-11 14:25:15 +0200 |
| commit | 504bc060baffada325f2fd138ee615e50e4ef023 (patch) | |
| tree | dfd01d34ad6e268e4237ec03139216f13896e5c8 | |
| parent | 4a055d7cd4c56c868b9fd03a96abc495f76ab68e (diff) | |
Add vespa-gtest to include and lib paths.
| -rw-r--r-- | bootstrap-cmake.sh | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index 13e49767964..233d1d91f61 100644 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -23,8 +23,8 @@ fi cmake3 \ -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm3.9/lib" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ + -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/llvm3.9/lib" \ ${EXTRA_CMAKE_ARGS} \ "${SOURCE_DIR}" diff --git a/dist/vespa.spec b/dist/vespa.spec index 5a355211e93..b2f1335b31b 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -98,8 +98,8 @@ Requires: gdb Requires: net-tools %if 0%{?centos} Requires: llvm3.9 -%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-cppunit/include +%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-gtest/lib;/opt/vespa-cppunit/lib +%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-gtest/include;/opt/vespa-cppunit/include %endif %if 0%{?fedora} %if 0%{?fc26} |