adapt README and vagrant scripts to cmake

diff --git a/README b/README
index 224b6569bdcb6802277b4eee287a6039beace6ce..7a760ff62251f0cf0477ca28c304faffd28da76a 100644 (file)
--- a/README
+++ b/README
@@ -29,13 +29,11 @@ is cloned as well by running `git submodule update --init`.
 
 Installation steps:
 
 
 Installation steps:
 

-0. If checking out from git run:
-
-     ./autogen.sh
-

 1. Compile Nominatim:
 
 1. Compile Nominatim:
 

-     ./configure
+     mkdir build
+     cd build
+     cmake ..

      make
 
 2. Get OSM data and import:
      make
 
 2. Get OSM data and import:

diff --git a/vagrant/centos-7-provision.sh b/vagrant/centos-7-provision.sh
index 93139a23d2a9873b2ec59c1d79d975d9f314aac9..db9d1b4f00823062e9598603fa953ba7fad140d7 100644 (file)
--- a/vagrant/centos-7-provision.sh
+++ b/vagrant/centos-7-provision.sh
@@ -15,7 +15,7 @@ yum update -y
 yum install -y epel-release
 
 yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
 yum install -y epel-release
 
 yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \

-               make automake gcc gcc-c++ libtool policycoreutils-python \
+               make cmake gcc gcc-c++ libtool policycoreutils-python \

                php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \
                expat-devel zlib-devel
                php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \
                expat-devel zlib-devel


@@ -70,13 +70,14 @@ cd /home/$USERNAME
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   yum install -y git
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   yum install -y git

-  sudo -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git
+  sudo -H -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git

 fi
 
 # Configure and compile the source.
 cd Nominatim
 fi
 
 # Configure and compile the source.
 cd Nominatim

-sudo -u $USERNAME ./autogen.sh
-sudo -u $USERNAME ./configure
+sudu -u $USERNAME mkdir build-vagrant
+cd build-vagrant
+sudo -u $USERNAME cmake ..

 sudo -u $USERNAME make
 
 # Make sure that postgres has access to the nominatim library.
 sudo -u $USERNAME make
 
 # Make sure that postgres has access to the nominatim library.

diff --git a/vagrant/ubuntu-trusty-provision.sh b/vagrant/ubuntu-trusty-provision.sh
index 84e98e23797644d82b9182ffa421cdf88a112d44..ed58d2e092e46ee78b6112fc51a2e1c58a674a5a 100755 (executable)
--- a/vagrant/ubuntu-trusty-provision.sh
+++ b/vagrant/ubuntu-trusty-provision.sh
@@ -36,7 +36,7 @@ USERNAME=vagrant
 sudo apt-get update -qq
 sudo apt-get upgrade -y
 sudo apt-get install -y build-essential libgeos-dev libpq-dev libbz2-dev \
 sudo apt-get update -qq
 sudo apt-get upgrade -y
 sudo apt-get install -y build-essential libgeos-dev libpq-dev libbz2-dev \

-                        libtool automake libproj-dev libboost-dev  libboost-system-dev \
+                        libtool cmake libproj-dev libboost-dev  libboost-system-dev \

                         libboost-filesystem-dev libboost-thread-dev libexpat-dev
 sudo apt-get autoremove -y
 
                         libboost-filesystem-dev libboost-thread-dev libexpat-dev
 sudo apt-get autoremove -y
 


@@ -89,13 +89,13 @@ cd /home/$USERNAME
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   sudo apt-get install -y git
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   sudo apt-get install -y git

-  sudo -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git
+  sudo -H -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git

 fi
 
 cd Nominatim
 fi
 
 cd Nominatim

-
-sudo -u $USERNAME ./autogen.sh
-sudo -u $USERNAME ./configure
+sudo -u $USERNAME mkdir build-vagrant
+cd build-vagrant
+sudo -u $USERNAME cmake ..

 sudo -u $USERNAME make
 chmod +x ./
 chmod +x ./module
 sudo -u $USERNAME make
 chmod +x ./
 chmod +x ./module