Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 787baeb23de7e0c9afb7621024d2f448b2c63391..816ce647613c4a996a6ee6c7ed980607f6b584fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,6 @@ if (BUILD_API)
    set(WEBSITESCRIPTS
        website/deletable.php
        website/details.php
    set(WEBSITESCRIPTS
        website/deletable.php
        website/details.php

-       website/hierarchy.php

        website/lookup.php
        website/polygons.php
        website/reverse.php
        website/lookup.php
        website/polygons.php
        website/reverse.php


@@ -129,6 +128,16 @@ if (BUILD_API)
        website/status.php
    )
 
        website/status.php
    )
 

+   set(WEBSITEFILES
+       403.html
+       509.html
+       crossdomain.xml
+       favicon.ico
+       nominatim.xml
+       robots.txt
+       taginfo.json
+   )
+

    foreach (script_source ${WEBSITESCRIPTS})
        configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
                       ${PROJECT_BINARY_DIR}/${script_source})
    foreach (script_source ${WEBSITESCRIPTS})
        configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
                       ${PROJECT_BINARY_DIR}/${script_source})


@@ -136,6 +145,11 @@ if (BUILD_API)
 
    set(WEBPATHS css images js)
 
 
    set(WEBPATHS css images js)
 

+   foreach (webfile ${WEBSITEFILES})
+       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
+                      ${PROJECT_BINARY_DIR}/website/${webfile})
+   endforeach()
+

    foreach (wp ${WEBPATHS})
        execute_process(
            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
    foreach (wp ${WEBPATHS})
        execute_process(
            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/


@@ -146,6 +160,11 @@ if (BUILD_API)
            php -S 127.0.0.1:8088
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
    )
            php -S 127.0.0.1:8088
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
    )

+
+   add_custom_target(serve-global
+           php -S 0.0.0.0:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )

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