summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-09-17 16:35:20 +0200
committerGitHub <noreply@github.com>2018-09-17 16:35:20 +0200
commitcd33f66c41a9b6d61b39ac599e085ea3a1075943 (patch)
tree76dea9c080a1ae261dfb30fbe085bbf9a7fdcc3f /vagrant
parent00241141adfa8a9ef6a75fc9d82887dbf00468fd (diff)
parent8b20cca43b2306305a3cbd37981ef0afc116badb (diff)
Merge pull request #6980 from vespa-engine/geirst/extend-clion-doc-with-toolchains-configuring
Extend note on configuring toolchains.
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/README.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/vagrant/README.md b/vagrant/README.md
index d5212692638..28883aa969c 100644
--- a/vagrant/README.md
+++ b/vagrant/README.md
@@ -79,10 +79,12 @@ Open a terminal inside the virtual CentOS desktop (password is "vagrant") and ru
clion
-When promoted, configure c and cpp compilers to
+When prompted, configure toolchains as follows:
- /opt/rh/devtoolset-7/root/usr/bin/cc
- /opt/rh/devtoolset-7/root/usr/bin/c++
+ CMake: /usr/bin/cmake3
+ Make: /usr/bin/make
+ C Compiler: /opt/rh/devtoolset-7/root/usr/bin/cc
+ C++ Compiler: /opt/rh/devtoolset-7/root/usr/bin/c++
#### 3. Open the Vespa Project
Go to *File* -> *Open* and choose &lt;vespa-source>&gt;/CMakeLists.txt.