Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e11e7b85e37d46abfb7e420882006e2561b8c25..89624069160887ab2cfc67e793a24bfc999063b1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 #
 #-----------------------------------------------------------------------------
 
-set(BUILD_TESTS on CACHE BOOL "Build test suite" FORCE)
+set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
 set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
 add_subdirectory(osm2pgsql)
 
@@ -42,6 +42,17 @@ 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")
+        message(WARNING "Osmosis not found (required for updates)")
+else()
+        set(OSMOSIS_PATH "${OSMOSIS}")
+        message(STATUS "Using osmosis at ${OSMOSIS_PATH}")
+endif()
+
 
 find_program(PG_CONFIG pg_config)
 execute_process(COMMAND ${PG_CONFIG} --pgxs
@@ -66,7 +77,6 @@ include_directories(${LIBXML2_INCLUDE_DIR})
 #-----------------------------------------------------------------------------
 
 set(CUSTOMFILES
-    settings/settings.php
     settings/phrase_settings.php
     website/deletable.php
     website/details.php
@@ -76,6 +86,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
@@ -92,6 +110,8 @@ foreach (cfile ${CUSTOMFILES})
     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
 endforeach()
 
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+
 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})
@@ -127,5 +147,6 @@ add_test(NAME php
 
 add_subdirectory(module)
 add_subdirectory(nominatim)
+add_subdirectory(docs)
 
 #-----------------------------------------------------------------------------