summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahoo-inc.com>2016-06-16 17:32:50 +0200
committerArnstein Ressem <aressem@yahoo-inc.com>2016-06-16 17:32:50 +0200
commit95e0eb34e1680e1ca7d99bbe24d073dd2b849379 (patch)
tree7f7b58109f5efcffea5d1d98f0a8fa20957fb791 /dist
parent9515d2054eb1b1db314604e608f3c719a0182e83 (diff)
Define include paths and library paths on command line.
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec8
1 files changed, 3 insertions, 5 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index ddf3961a2ea..1bcda21c45c 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -53,12 +53,10 @@ This is the Vespa!
source /opt/rh/devtoolset-4/enable || true
sh bootstrap.sh
-cmake3 \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DJAVA_HOME=/usr/lib/jvm/java-openjdk \
- -DEXTRA_LINK_DIRECTORY=%{_prefix}/lib64 \
- -DCMAKE_C_COMPILER=gcc \
- -DCMAKE_CXX_COMPILER=g++ \
+ -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm" \
+ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include" \
-DCMAKE_INSTALL_RPATH=%{_prefix}/lib64 \
-DCMAKE_BUILD_RPATH=%{_prefix}/lib64 \
.