precompute replacements while loading configuration

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2001d15345ad9f4d126d744b70fafdaf87223c1..63081fdf06b9b4c1a40eb52df807362a891d95fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ endif()
 #-----------------------------------------------------------------------------
 
 if (BUILD_IMPORTER)
 #-----------------------------------------------------------------------------
 
 if (BUILD_IMPORTER)

-    find_package(PythonInterp 3.5 REQUIRED)
+    find_package(PythonInterp 3.6 REQUIRED)

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


@@ -153,7 +153,7 @@ if (BUILD_TESTS)
     if (PHPCS)
         message(STATUS "Using phpcs binary ${PHPCS}")
         add_test(NAME phpcs
     if (PHPCS)
         message(STATUS "Using phpcs binary ${PHPCS}")
         add_test(NAME phpcs

-                 COMMAND ${PHPCS} --report-width=120 --colors lib website utils
+                 COMMAND ${PHPCS} --report-width=120 --colors lib-php

                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
     else()
         message(WARNING "phpcs not found. PHP linting tests disabled." )
                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
     else()
         message(WARNING "phpcs not found. PHP linting tests disabled." )


@@ -258,5 +258,7 @@ install(FILES settings/env.defaults
               settings/import-address.style
               settings/import-full.style
               settings/import-extratags.style
               settings/import-address.style
               settings/import-full.style
               settings/import-extratags.style

-              settings/legacy_icu_tokenizer.json
+              settings/icu_tokenizer.yaml
+              settings/icu-rules/extended-unicode-to-asccii.yaml
+              settings/country_settings.yaml

         DESTINATION ${NOMINATIM_CONFIGDIR})
         DESTINATION ${NOMINATIM_CONFIGDIR})