Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44574610674aa30f3190368ea3fb4dabb246a79d..9ca95a29b0cdd4fd913dfb53f6de2b5d62248260 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,12 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
 set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
+
+if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt")
+    message(FATAL_ERROR "The osm2pgsql directory is empty.\
+    Did you forget to check out Nominatim recursively?\
+    \nTry updating submodules with: git submodule update --init")
+endif()
 add_subdirectory(osm2pgsql)
 
 find_package(Threads REQUIRED)
@@ -42,6 +48,8 @@ unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
 set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
 find_package(PostgreSQL REQUIRED)
 include_directories(${PostgreSQL_INCLUDE_DIRS})
+link_directories(${PostgreSQL_LIBRARY_DIRS})
+
 find_program(OSMOSIS osmosis)
 if (NOT EXISTS "${OSMOSIS}")
         set(OSMOSIS_PATH "/nonexistent")
@@ -84,6 +92,14 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
+    website/403.html
+    website/509.html
+    website/crossdomain.xml
+    website/favicon.ico
+    website/last_update.php
+    website/nominatim.xml
+    website/robots.txt
+    website/taginfo.json
     utils/blocks.php
     utils/country_languages.php
     utils/imports.php