From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 5 Jan 2023 10:39:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~80
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d485aef7019206bc02167d391c91cb1aa47fe6dc?hp=-c

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

d485aef7019206bc02167d391c91cb1aa47fe6dc
diff --combined CMakeLists.txt
index c8a57521,8200e757..3f68012f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -73,7 -73,7 +73,7 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_IMPORTER)
-     find_package(PythonInterp 3.6 REQUIRED)
+     find_package(PythonInterp 3.7 REQUIRED)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -124,27 -124,6 +124,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
  #-----------------------------------------------------------------------------