X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/141b32f4192819579adbc1388a90ba92d47485e6..b616fab64dcc28e1f4c7f80abfff4fddf63d83d6:/CMakeLists.txt?ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index 347f4d48..17b5cd72 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 1) +set(NOMINATIM_VERSION_MINOR 4) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") @@ -35,56 +35,61 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE) set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE) - -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) - -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}) - -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.") +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(ZLIB REQUIRED) - -find_package(BZip2 REQUIRED) - -find_package(LibXml2 REQUIRED) -include_directories(${LIBXML2_INCLUDE_DIR}) - #----------------------------------------------------------------------------- # # Setup settings and paths # #----------------------------------------------------------------------------- -set(CUSTOMFILES - settings/phrase_settings.php +set(WEBSITESCRIPTS website/deletable.php website/details.php website/hierarchy.php @@ -93,32 +98,46 @@ set(CUSTOMFILES 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 +) + +set(WEBSITEFILES + 403.html + 509.html + crossdomain.xml + favicon.ico + nominatim.xml + robots.txt + taginfo.json +) + +set(CUSTOMSCRIPTS + utils/check_import_finished.php utils/country_languages.php - utils/imports.php - utils/importWikipedia.php utils/export.php utils/query.php - utils/server_compare.php utils/setup.php utils/specialphrases.php utils/update.php utils/warm.php ) -foreach (cfile ${CUSTOMFILES}) - configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile}) +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() + +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) set(WEBPATHS css images js) @@ -135,26 +154,29 @@ endforeach() # #----------------------------------------------------------------------------- -include(CTest) +if (NOT ONLY_DOCS) + include(CTest) -set(TEST_BDD db osm2pgsql api) + 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) - set_tests_properties(bdd_${test} - PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}") -endforeach() + 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() -add_test(NAME php - COMMAND phpunit ./ - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php) + 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) #-----------------------------------------------------------------------------