Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aaf05f049b73e7d63ec4b0f7644340b80ea73ba..71075c8217a19cac82bce792d64465a33b28a7ba 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)
 
 set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
 add_subdirectory(osm2pgsql)
 


@@ -66,7 +66,6 @@ include_directories(${LIBXML2_INCLUDE_DIR})
 #-----------------------------------------------------------------------------
 
 set(CUSTOMFILES
 #-----------------------------------------------------------------------------
 
 set(CUSTOMFILES

-    settings/settings.php

     settings/phrase_settings.php
     website/deletable.php
     website/details.php
     settings/phrase_settings.php
     website/deletable.php
     website/details.php


@@ -76,6 +75,14 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
     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
     utils/blocks.php
     utils/country_languages.php
     utils/imports.php


@@ -92,6 +99,8 @@ foreach (cfile ${CUSTOMFILES})
     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
 endforeach()
 
     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})
 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})