update cMake build documentation

Remove the dependency on libxml, no longer needed.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edad9bbc4f37c583368da835f81497b29ba7cebb..ba234d55af4b3f558059f3b1321ceed6f2f01be1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,6 @@ if (NOT ONLY_DOCS)
     endif()
     add_subdirectory(osm2pgsql)
 
-    find_package(Threads REQUIRED)
-
     unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
     set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
     find_package(PostgreSQL REQUIRED)
@@ -74,13 +72,6 @@ if (NOT ONLY_DOCS)
         message(FATAL_ERROR "Postgresql server package not found.")
     endif()
 
-    find_package(ZLIB REQUIRED)
-
-    find_package(BZip2 REQUIRED)
-
-    find_package(LibXml2 REQUIRED)
-    include_directories(${LIBXML2_INCLUDE_DIR})
-
     # Setting PHP binary variable as to command line (prevailing) or auto detect
     if (NOT PHP_BIN)
          find_program (PHP_BIN php)

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index c67ff46ff3f15cd115f85aa76545b2e92e511ffa..d6232c8b4138baa8308413e3ae1994c18d640a6f 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -25,24 +25,20 @@ and can't offer support.
 For compiling:
 
   * [cmake](https://cmake.org/)
-  * [libxml2](http://xmlsoft.org/)
+  * [expat](https://libexpat.github.io/)
+  * [proj](https://proj.org/)
+  * [bzip2](http://www.bzip.org/)
+  * [zlib](https://www.zlib.net/)
+  * [Boost libraries](https://www.boost.org/), including system and filesystem
+  * PostgreSQL client libraries
   * a recent C++ compiler (gcc 5+ or Clang 3.8+)
 
-Nominatim comes with its own version of osm2pgsql. See the
-[osm2pgsql README](https://github.com/openstreetmap/osm2pgsql/blob/master/README.md#building)
-for additional dependencies required for compiling osm2pgsql.
-
-For running tests:
-
-  * [behave](http://pythonhosted.org/behave/)
-  * [Psycopg2](https://initd.org/psycopg)
-  * [nose](https://nose.readthedocs.io)
-  * [phpunit](https://phpunit.de)
-
 For running Nominatim:
 
   * [PostgreSQL](https://www.postgresql.org) (9.3 or later)
   * [PostGIS](https://postgis.org) (2.2 or later)
+  * [Python 3](https://www.python.org/)
+  * [Psycopg2](https://initd.org/psycopg)
   * [PHP](https://php.net) (7.0 or later)
   * PHP-pgsql
   * PHP-intl (bundled with PHP)
@@ -52,6 +48,12 @@ For running continuous updates:
 
   * [pyosmium](https://osmcode.org/pyosmium/) (with Python 3)
 
+For running tests:
+
+  * [behave](http://pythonhosted.org/behave/)
+  * [nose](https://nose.readthedocs.io)
+  * [phpunit](https://phpunit.de)
+
 ### Hardware
 
 A minimum of 2GB of RAM is required or installation will fail. For a full

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index b456fb74fd1fb6dfc12f752abb2a5e70fadac387..f3debd8b25324110d7c3ffdb3b52ad0476705274 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -32,7 +32,7 @@
                         wget git cmake make gcc gcc-c++ libtool policycoreutils-python \
                         devtoolset-7 llvm-toolset-7 \
                         php-pgsql php php-intl libpqxx-devel \
-                        proj-epsg bzip2-devel proj-devel libxml2-devel boost-devel \
+                        proj-epsg bzip2-devel proj-devel boost-devel \
                         expat-devel zlib-devel
 
 # If you want to run the test suite, you need to install the following

diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
index f05f2b6347cfa8dd413c1a5dacd1cdf3e12f7476..f84f651c0cd2aed2a5f00cffbbbe2a46f85a9d9c 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -25,7 +25,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # Now you can install all packages needed for Nominatim:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
-                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
+                            libboost-filesystem-dev libexpat1-dev zlib1g-dev\
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \
                             postgresql-contrib-9.5 \

diff --git a/vagrant/Install-on-Ubuntu-18-nginx.sh b/vagrant/Install-on-Ubuntu-18-nginx.sh
index 567149895555bf10aad3ada4550cc067f396e4fc..d93cdc5bd3dea5b7004dab6ce73ca4b2e61a6e6b 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18-nginx.sh
+++ b/vagrant/Install-on-Ubuntu-18-nginx.sh
@@ -18,7 +18,7 @@ export DEBIAN_FRONTEND=noninteractive
 
     sudo apt-get update -qq
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
-                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
+                            libboost-filesystem-dev libexpat1-dev zlib1g-dev\
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                             postgresql-contrib-10 \

diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index c27a5d4046456fce8854ac78d4a8daa98742a69a..140727a36e7df993e504155d3eda984992c5dd0e 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -25,7 +25,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 # Now you can install all packages needed for Nominatim:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
-                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev \
+                            libboost-filesystem-dev libexpat1-dev zlib1g-dev\
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                             postgresql-contrib-10 postgresql-10-postgis-scripts \