Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bd858803693749b807f15f076457e2e6ad8db20..17b5cd7229000864ac9e09003409f4edcc84a428 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,14 +45,14 @@ if (NOT ONLY_DOCS)
     endif()
     add_subdirectory(osm2pgsql)
 
     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)
     include_directories(${PostgreSQL_INCLUDE_DIRS})
     link_directories(${PostgreSQL_LIBRARY_DIRS})
 
     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_package(PythonInterp 3)
+

     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")
         set(PYOSMIUM_PATH "")
     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")
         set(PYOSMIUM_PATH "")


@@ -72,13 +72,6 @@ if (NOT ONLY_DOCS)
         message(FATAL_ERROR "Postgresql server package not found.")
     endif()
 
         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)
     # Setting PHP binary variable as to command line (prevailing) or auto detect
     if (NOT PHP_BIN)
          find_program (PHP_BIN php)


@@ -107,7 +100,18 @@ set(WEBSITESCRIPTS
     website/status.php
 )
 
     website/status.php
 )
 

+set(WEBSITEFILES
+    403.html
+    509.html
+    crossdomain.xml
+    favicon.ico
+    nominatim.xml
+    robots.txt
+    taginfo.json
+)
+

 set(CUSTOMSCRIPTS
 set(CUSTOMSCRIPTS

+    utils/check_import_finished.php

     utils/country_languages.php
     utils/export.php
     utils/query.php
     utils/country_languages.php
     utils/export.php
     utils/query.php


@@ -127,6 +131,11 @@ foreach (script_source ${WEBSITESCRIPTS})
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 

+foreach (webfile ${WEBSITEFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
+                   ${PROJECT_BINARY_DIR}/website/${webfile})
+endforeach()
+

 configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
                ${PROJECT_BINARY_DIR}/settings/settings.php)
 
 configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
                ${PROJECT_BINARY_DIR}/settings/settings.php)
 


@@ -167,7 +176,6 @@ endif()
 
 if (NOT ONLY_DOCS)
     add_subdirectory(module)
 
 if (NOT ONLY_DOCS)
     add_subdirectory(module)

-    add_subdirectory(nominatim)

 endif()
 add_subdirectory(docs)
 
 endif()
 add_subdirectory(docs)