adapt BDD tests to stricter partial search

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63081fdf06b9b4c1a40eb52df807362a891d95fc..7ab4fb7c6a9bf65c5ba916b504152b3661d58f47 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ set(BUILD_TESTS on CACHE BOOL "Build test suite")
 set(BUILD_DOCS on CACHE BOOL "Build documentation")
 set(BUILD_MANPAGE on CACHE BOOL "Build Manual Page")
 set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)")
 set(BUILD_DOCS on CACHE BOOL "Build documentation")
 set(BUILD_MANPAGE on CACHE BOOL "Build Manual Page")
 set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)")

+set(INSTALL_MUNIN_PLUGINS on CACHE BOOL "Install Munin plugins for supervising Nominatim")

 
 #-----------------------------------------------------------------------------
 #  osm2pgsql (imports/updates only)
 
 #-----------------------------------------------------------------------------
 #  osm2pgsql (imports/updates only)


@@ -199,7 +200,7 @@ endif()
 #-----------------------------------------------------------------------------
 
 if (BUILD_MANPAGE)
 #-----------------------------------------------------------------------------
 
 if (BUILD_MANPAGE)

-   add_subdirectory(manual)
+   add_subdirectory(man)

 endif()
 
 #-----------------------------------------------------------------------------
 endif()
 
 #-----------------------------------------------------------------------------


@@ -211,6 +212,7 @@ include(GNUInstallDirs)
 set(NOMINATIM_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME})
 set(NOMINATIM_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
 set(NOMINATIM_CONFIGDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME})
 set(NOMINATIM_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME})
 set(NOMINATIM_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
 set(NOMINATIM_CONFIGDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME})

+set(NOMINATIM_MUNINDIR ${CMAKE_INSTALL_FULL_DATADIR}/munin/plugins)

 
 if (BUILD_IMPORTER)
     configure_file(${PROJECT_SOURCE_DIR}/cmake/tool-installed.tmpl installed.bin)
 
 if (BUILD_IMPORTER)
     configure_file(${PROJECT_SOURCE_DIR}/cmake/tool-installed.tmpl installed.bin)


@@ -259,6 +261,15 @@ install(FILES settings/env.defaults
               settings/import-full.style
               settings/import-extratags.style
               settings/icu_tokenizer.yaml
               settings/import-full.style
               settings/import-extratags.style
               settings/icu_tokenizer.yaml

-              settings/icu-rules/extended-unicode-to-asccii.yaml

               settings/country_settings.yaml
         DESTINATION ${NOMINATIM_CONFIGDIR})
               settings/country_settings.yaml
         DESTINATION ${NOMINATIM_CONFIGDIR})

+
+install(DIRECTORY settings/icu-rules
+        DESTINATION ${NOMINATIM_CONFIGDIR})
+
+if (INSTALL_MUNIN_PLUGINS)
+    install(FILES munin/nominatim_importlag
+                  munin/nominatim_query_speed
+                  munin/nominatim_requests
+            DESTINATION ${NOMINATIM_MUNINDIR})
+endif()