X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2051a84a09d4a370fa74db1ba8742e9095b842fc..5d656891ba072d88b8b281d239d0dce9f7bd6a1c:/CMakeLists.txt?ds=sidebyside

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bd85880..b4f4ddb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
-set(NOMINATIM_VERSION_MINOR 4)
+set(NOMINATIM_VERSION_MINOR 6)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -28,30 +28,40 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 
 #-----------------------------------------------------------------------------
-#
-#  Find external dependencies
-#
+#  Configuration
 #-----------------------------------------------------------------------------
 
-set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
-set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
-set(ONLY_DOCS off CACHE BOOL "Build documentation only")
+set(BUILD_IMPORTER on CACHE BOOL "Build everything for importing/updating the database")
+set(BUILD_API on CACHE BOOL "Build everything for the API server")
+set(BUILD_MODULE on CACHE BOOL "Build PostgreSQL module")
+set(BUILD_TESTS on CACHE BOOL "Build test suite")
+set(BUILD_DOCS on CACHE BOOL "Build documentation")
+set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)")
+
+#-----------------------------------------------------------------------------
+#  osm2pgsql (imports/updates only)
+#-----------------------------------------------------------------------------
 
-if (NOT ONLY_DOCS)
+if (BUILD_IMPORTER AND BUILD_OSM2PGSQL)
     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()
+    set(BUILD_TESTS_SAVED "${BUILD_TESTS}")
+    set(BUILD_TESTS off)
+    set(WITH_LUA off CACHE BOOL "")
     add_subdirectory(osm2pgsql)
+    set(BUILD_TESTS ${BUILD_TESTS_SAVED})
+endif()
+
 
-    find_package(Threads REQUIRED)
+#-----------------------------------------------------------------------------
+#  python and pyosmium (imports/updates only)
+#-----------------------------------------------------------------------------
 
-    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})
+if (BUILD_IMPORTER)
+    find_package(PythonInterp 3)
 
     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")
@@ -61,25 +71,15 @@ if (NOT ONLY_DOCS)
         set(PYOSMIUM_PATH "${PYOSMIUM}")
         message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}")
     endif()
+endif()
 
+#-----------------------------------------------------------------------------
+# PHP
+#-----------------------------------------------------------------------------
 
-    find_program(PG_CONFIG pg_config)
-    execute_process(COMMAND ${PG_CONFIG} --pgxs
-                    OUTPUT_VARIABLE PGXS
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (NOT EXISTS "${PGXS}")
-        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
 
-    # Setting PHP binary variable as to command line (prevailing) or auto detect
+if (BUILD_API OR BUILD_IMPORTER)
     if (NOT PHP_BIN)
          find_program (PHP_BIN php)
     endif()
@@ -91,84 +91,82 @@ if (NOT ONLY_DOCS)
 endif()
 
 #-----------------------------------------------------------------------------
-#
-# Setup settings and paths
-#
+# import scripts and utilities (importer only)
 #-----------------------------------------------------------------------------
 
-set(WEBSITESCRIPTS
-    website/deletable.php
-    website/details.php
-    website/hierarchy.php
-    website/lookup.php
-    website/polygons.php
-    website/reverse.php
-    website/search.php
-    website/status.php
-)
-
-set(CUSTOMSCRIPTS
-    utils/country_languages.php
-    utils/export.php
-    utils/query.php
-    utils/setup.php
-    utils/specialphrases.php
-    utils/update.php
-    utils/warm.php
-   )
-
-foreach (script_source ${CUSTOMSCRIPTS})
-    configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
-                   ${PROJECT_BINARY_DIR}/${script_source})
-endforeach()
-
-foreach (script_source ${WEBSITESCRIPTS})
-    configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
-                   ${PROJECT_BINARY_DIR}/${script_source})
-endforeach()
-
-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
-               ${PROJECT_BINARY_DIR}/settings/settings.php)
+if (BUILD_IMPORTER)
+   set(CUSTOMSCRIPTS
+       check_import_finished.php
+       country_languages.php
+       importWikipedia.php
+       export.php
+       query.php
+       setup.php
+       specialphrases.php
+       update.php
+       warm.php
+      )
+
+   foreach (script_source ${CUSTOMSCRIPTS})
+       configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                      ${PROJECT_BINARY_DIR}/utils/${script_source})
+   endforeach()
+endif()
 
-set(WEBPATHS css images js)
+#-----------------------------------------------------------------------------
+# Targets for running a development webserver from the build directory.
+#-----------------------------------------------------------------------------
 
-foreach (wp ${WEBPATHS})
-    execute_process(
-        COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-    )
-endforeach()
+if (BUILD_API)
+   add_custom_target(serve
+           php -S 127.0.0.1:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )
 
+   add_custom_target(serve-global
+           php -S 0.0.0.0:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )
+endif()
 
 #-----------------------------------------------------------------------------
-#
 # Tests
-#
 #-----------------------------------------------------------------------------
 
-if (NOT ONLY_DOCS)
+if (BUILD_TESTS)
     include(CTest)
 
     set(TEST_BDD db osm2pgsql api)
 
     foreach (test ${TEST_BDD})
         add_test(NAME bdd_${test}
-                 COMMAND lettuce features/${test}
-                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
+                 COMMAND behave ${test}
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/bdd)
         set_tests_properties(bdd_${test}
             PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}")
     endforeach()
 
     add_test(NAME php
              COMMAND phpunit ./
-             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php)
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/php)
+
+    add_test(NAME phpcs
+             COMMAND phpcs --report-width=120 --colors lib website utils
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 endif()
 
+#-----------------------------------------------------------------------------
+# Postgres module
 #-----------------------------------------------------------------------------
 
-if (NOT ONLY_DOCS)
+if (BUILD_MODULE)
     add_subdirectory(module)
-    add_subdirectory(nominatim)
 endif()
-add_subdirectory(docs)
 
 #-----------------------------------------------------------------------------
+# Documentation
+#-----------------------------------------------------------------------------
+
+if (BUILD_DOCS)
+   add_subdirectory(docs)
+endif()