From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 20 Aug 2024 07:16:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~1
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/330b8d2fdfdd935da123abf9ecf96b3bc7a12be5?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/master'
---

330b8d2fdfdd935da123abf9ecf96b3bc7a12be5
diff --combined CMakeLists.txt
index 83e34403,d1c2702a..4b4e3fc9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -113,27 -113,6 +113,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -292,3 -271,7 +292,7 @@@ if (INSTALL_MUNIN_PLUGINS
                    munin/nominatim_requests
              DESTINATION ${NOMINATIM_MUNINDIR})
  endif()
+ 
+ message(WARNING "Building with CMake is deprecated and will be removed in Nominatim 5.0."
+                 "Use Nominatim pip packages instead.\n"
+                 "See https://nominatim.org/release-docs/develop/admin/Installation/#downloading-and-building-nominatim")