From 7ad9f8bbb23150885fc039b14b277faddeba3386 Mon Sep 17 00:00:00 2001 From: Keith Wansbrough Date: Thu, 15 Oct 2015 20:24:32 +0100 Subject: [PATCH 1/3] PPA required for Ubuntu 14.04 installation. You also need a PPA that gives you an up-to-date version of libc++. --- docs/INSTALL.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 973bd7b3b7..4ca6b598c1 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -57,6 +57,11 @@ Do a git clone: cd omim echo | ./configure.sh +On Ubuntu 14.04, you'll need a PPA with an up-to-date version of libc++. +You shouldn't need this on newer versions. + + sudo add-apt-repository ppa:jhe/llvm-toolchain + Then: sudo apt-get install clang-3.5 libc++-dev libboost-iostreams-dev libglu1-mesa-dev From a450dec312a5664119d72912e14d3dc44aac7341 Mon Sep 17 00:00:00 2001 From: Keith Wansbrough Date: Sat, 17 Oct 2015 20:46:43 +0100 Subject: [PATCH 2/3] Explain where binaries appear. --- docs/INSTALL.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 4ca6b598c1..89519ef278 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -72,6 +72,9 @@ Then: Prepend with `CONFIG=gtool` if only generator_tool is needed. You would need 1.5 GB of memory to compile `stats` module. +The generated binaries appear in `omim-build-/out//`. +Run tests from this directory with `../../../omim/tools/unix/run_tests.sh`. + To build and run OSRM binaries: sudo apt-get install libtbb2 libluabind0.9.1 liblua50 libstxxl1 From 8af8a284321a6aa663ad9e581a3a70197aa20c7a Mon Sep 17 00:00:00 2001 From: Keith Wansbrough Date: Thu, 12 Nov 2015 21:56:48 +0000 Subject: [PATCH 3/3] Qt 5.5 setup has to be done each time. --- docs/INSTALL.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 89519ef278..c7c9f0d81a 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -49,6 +49,9 @@ Install Qt 5.5: sudo add-apt-repository ppa:beineri/opt-qt55-trusty sudo apt-get update sudo apt-get install qt55base + +Set up the Qt 5.5 environment: + source /opt/qt55/bin/qt55-env.sh Do a git clone: