details html page: no longer use place_id in URLs

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5587741a125892e7ac6a756854a577d5498a448..ba234d55af4b3f558059f3b1321ceed6f2f01be1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 project(nominatim)
 
 
 project(nominatim)
 

-set(NOMINATIM_VERSION_MAJOR 2)
-set(NOMINATIM_VERSION_MINOR 5)
+set(NOMINATIM_VERSION_MAJOR 3)
+set(NOMINATIM_VERSION_MINOR 4)
+set(NOMINATIM_VERSION_PATCH 0)

 
 

-set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}")
+set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")

 
 add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 
 add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 


@@ -32,30 +33,135 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 #
 #-----------------------------------------------------------------------------
 
 #
 #-----------------------------------------------------------------------------
 

-add_subdirectory(osm2pgsql)
+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")
+
+if (NOT ONLY_DOCS)
+    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()
+    add_subdirectory(osm2pgsql)
+
+    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 "")
+            message(WARNING "pyosmium-get-changes not found (required for updates)")
+    else()
+        set(PYOSMIUM_PATH "${PYOSMIUM}")
+        message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}")
+    endif()
+
+
+    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()
+
+    # Setting PHP binary variable as to command line (prevailing) or auto detect
+    if (NOT PHP_BIN)
+         find_program (PHP_BIN php)
+    endif()
+    # sanity check if PHP binary exists
+    if (NOT EXISTS ${PHP_BIN})
+        message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ")
+    endif()
+    message (STATUS "Using PHP binary " ${PHP_BIN})
+endif()

 
 

-find_package(Threads REQUIRED)
+#-----------------------------------------------------------------------------
+#
+# Setup settings and paths
+#
+#-----------------------------------------------------------------------------
+
+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/check_import_finished.php
+    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)
+
+set(WEBPATHS css images js)
+
+foreach (wp ${WEBPATHS})
+    execute_process(
+        COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
+    )
+endforeach()

 
 

-unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
-set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
-find_package(PostgreSQL REQUIRED)
-include_directories(${PostgreSQL_INCLUDE_DIRS})

 
 

-find_program(PG_CONFIG pg_config)
-execute_process(COMMAND ${PG_CONFIG} --pgxs
-                OUTPUT_VARIABLE PGXS
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
+#-----------------------------------------------------------------------------
+#
+# Tests
+#
+#-----------------------------------------------------------------------------
+
+if (NOT ONLY_DOCS)
+    include(CTest)

 
 

-find_package(ZLIB REQUIRED)
+    set(TEST_BDD db osm2pgsql api)

 
 

-find_package(BZip2 REQUIRED)
+    foreach (test ${TEST_BDD})
+        add_test(NAME bdd_${test}
+                 COMMAND lettuce features/${test}
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
+        set_tests_properties(bdd_${test}
+            PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}")
+    endforeach()

 
 

-find_package(LibXml2 REQUIRED)
-include_directories(${LIBXML2_INCLUDE_DIR})
+    add_test(NAME php
+             COMMAND phpunit ./
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php)
+endif()

 
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------
 

-add_subdirectory(module)
-add_subdirectory(nominatim)
+if (NOT ONLY_DOCS)
+    add_subdirectory(module)
+endif()
+add_subdirectory(docs)

 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------