diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 15:09:55 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 15:24:33 +0200 |
| commit | 84e12aa5311b41b51fc387719b41d5fbc57ff9fd (patch) | |
| tree | b35e567bdeaa6b6987555319d3211d7346e1614d /docker | |
| parent | dff23cc1b8cedc23d470cee373d5358153380ee3 (diff) | |
Fix bug where cmake is called in wrong directory
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci/build-and-test.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/ci/build-and-test.sh b/docker/ci/build-and-test.sh index 030d662bf0f..cfebe09877b 100644 --- a/docker/ci/build-and-test.sh +++ b/docker/ci/build-and-test.sh @@ -17,8 +17,9 @@ NUM_THREADS=$4 function bootstrap { source /opt/rh/devtoolset-6/enable || true export MAVEN_OPTS="-Xms128m -Xmx512m" - sh ./bootstrap.sh full - cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ + cd "${SOURCE_DIR}" && sh ./bootstrap.sh full + cd "${BUILD_DIR}" && cmake3 \ + -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ |