diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2018-05-11 20:30:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 20:30:43 +0200 |
| commit | 786ebde378567d5de38465b43f1bae98a7302d41 (patch) | |
| tree | e36abab1afcec5525a0214b9e55b11a56e3665a3 | |
| parent | c003047c5a9017d0a981b99eeb6dad240e5f730c (diff) | |
| parent | cb47aa8e8c889dc949f9c1aabd63c6860285b4f0 (diff) | |
Merge pull request #5845 from vespa-engine/aressem/add-gtest
Aressem/add gtest
| -rw-r--r-- | bootstrap-cmake.sh | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index 13e49767964..739dc79f001 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/include;/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..fc110ba8f4f 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -34,6 +34,7 @@ BuildRequires: Judy-devel BuildRequires: cmake3 BuildRequires: llvm3.9-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 +BuildRequires: vespa-gtest >= 1.8.0-1 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 @@ -98,8 +99,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} |