Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcc7075ab5cd3c36056433bfd2ea7635d0c0b765..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)


@@ -118,8 +111,8 @@ set(WEBSITEFILES
 )
 
 set(CUSTOMSCRIPTS
 )
 
 set(CUSTOMSCRIPTS

+    utils/check_import_finished.php

     utils/country_languages.php
     utils/country_languages.php

-    utils/importWikipedia.php

     utils/export.php
     utils/query.php
     utils/setup.php
     utils/export.php
     utils/query.php
     utils/setup.php


@@ -183,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)