fix sql warnings

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca35eca4449fe7b7756e9a0282aa779b975ca3c..cbbcb9db2d0f040dfa802d8140200753de52c270 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,14 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 #
 #-----------------------------------------------------------------------------
 
 #
 #-----------------------------------------------------------------------------
 

-set(BUILD_TESTS on)
-set(WITH_LUA off)
+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)
 add_subdirectory(osm2pgsql)
 
 find_package(Threads REQUIRED)


@@ -42,12 +48,27 @@ 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(OSMOSIS osmosis)
+if (NOT EXISTS "${OSMOSIS}")
+        set(OSMOSIS_PATH "/nonexistent")
+        message(WARNING "Osmosis not found (required for updates)")
+else()
+        set(OSMOSIS_PATH "${OSMOSIS}")
+        message(STATUS "Using osmosis at ${OSMOSIS_PATH}")
+endif()
+

 
 find_program(PG_CONFIG pg_config)
 execute_process(COMMAND ${PG_CONFIG} --pgxs
                 OUTPUT_VARIABLE PGXS
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 
 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(ZLIB REQUIRED)
 
 find_package(BZip2 REQUIRED)


@@ -62,7 +83,6 @@ include_directories(${LIBXML2_INCLUDE_DIR})
 #-----------------------------------------------------------------------------
 
 set(CUSTOMFILES
 #-----------------------------------------------------------------------------
 
 set(CUSTOMFILES

-    settings/settings.php

     settings/phrase_settings.php
     website/deletable.php
     website/details.php
     settings/phrase_settings.php
     website/deletable.php
     website/details.php


@@ -88,6 +108,8 @@ foreach (cfile ${CUSTOMFILES})
     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
 endforeach()
 
     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
 endforeach()
 

+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+

 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})
 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})


@@ -123,5 +145,6 @@ add_test(NAME php
 
 add_subdirectory(module)
 add_subdirectory(nominatim)
 
 add_subdirectory(module)
 add_subdirectory(nominatim)

+add_subdirectory(docs)

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