From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 10 May 2022 07:21:16 +0000 (+0200)
Subject: Merge pull request #2702 from lonvia/move-country-names-into-includes
X-Git-Tag: v4.1.0~46
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ed6fda696864be2b0970ec1eae327f48c00f7fd1?ds=sidebyside;hp=-c

Merge pull request #2702 from lonvia/move-country-names-into-includes

Clean up country name settings
---

ed6fda696864be2b0970ec1eae327f48c00f7fd1
diff --combined CMakeLists.txt
index 52bb9a01,782c0cdb..af7dbc2a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -26,17 -26,6 +26,17 @@@ set(NOMINATIM_VERSION "${NOMINATIM_VERS
  
  add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
  
 +# Setting GIT_HASH
 +find_package(Git)
 +if (GIT_FOUND)
 +    execute_process(
 +        COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h
 +        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 +        OUTPUT_VARIABLE GIT_HASH
 +        OUTPUT_STRIP_TRAILING_WHITESPACE
 +        ERROR_QUIET
 +        )
 +endif()
  
  #-----------------------------------------------------------------------------
  #  Configuration
@@@ -276,6 -265,8 +276,8 @@@ install(FILES settings/env.default
  
  install(DIRECTORY settings/icu-rules
          DESTINATION ${NOMINATIM_CONFIGDIR})
+ install(DIRECTORY settings/country-names
+         DESTINATION ${NOMINATIM_CONFIGDIR})
  
  if (INSTALL_MUNIN_PLUGINS)
      install(FILES munin/nominatim_importlag