match languages such as ja_rm (or any other with underscore) properly

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65254b1c2cda88510eabf0905d32f5a9ceb83db6..d6f7d2cb94d5abcd32ef4d59672f4ce1230981cb 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 2)
+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,8 +33,14 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 #
 #-----------------------------------------------------------------------------
 
 #
 #-----------------------------------------------------------------------------
 

-set(BUILD_TESTS on CACHE BOOL "Build test suite" FORCE)
+set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)

 set(WITH_LUA off CACHE BOOL "Build with lua support" 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)
 add_subdirectory(osm2pgsql)
 
 find_package(Threads REQUIRED)


@@ -42,6 +49,17 @@ unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
 set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
 find_package(PostgreSQL REQUIRED)
 include_directories(${PostgreSQL_INCLUDE_DIRS})
 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
 
 find_program(PG_CONFIG pg_config)
 execute_process(COMMAND ${PG_CONFIG} --pgxs


@@ -59,6 +77,16 @@ find_package(BZip2 REQUIRED)
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 
 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)
+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})
+

 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths
 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths


@@ -77,8 +105,8 @@ set(CUSTOMFILES
     website/status.php
     utils/blocks.php
     utils/country_languages.php
     website/status.php
     utils/blocks.php
     utils/country_languages.php

-    utils/imports.php

     utils/importWikipedia.php
     utils/importWikipedia.php

+    utils/export.php

     utils/query.php
     utils/server_compare.php
     utils/setup.php
     utils/query.php
     utils/server_compare.php
     utils/setup.php