add hint that setup.php must be run from build directory

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index af6b9a9..7d401ad
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)

-set(NOMINATIM_VERSION_MINOR 1)
+set(NOMINATIM_VERSION_MINOR 2)

 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")


@@ -93,8 +93,7 @@ message (STATUS "Using PHP binary " ${PHP_BIN})
 #
 #-----------------------------------------------------------------------------
 
 #
 #-----------------------------------------------------------------------------
 

-set(CUSTOMFILES
-    settings/phrase_settings.php
+set(WEBSITESCRIPTS

     website/deletable.php
     website/details.php
     website/hierarchy.php
     website/deletable.php
     website/details.php
     website/hierarchy.php


@@ -103,24 +102,31 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
     website/reverse.php
     website/search.php
     website/status.php

-    utils/blocks.php
+)
+
+set(CUSTOMSCRIPTS

     utils/country_languages.php
     utils/country_languages.php

-    utils/imports.php

     utils/importWikipedia.php
     utils/export.php
     utils/query.php
     utils/importWikipedia.php
     utils/export.php
     utils/query.php

-    utils/server_compare.php

     utils/setup.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php
    )
 
     utils/setup.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php
    )
 

-foreach (cfile ${CUSTOMFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+foreach (script_source ${CUSTOMSCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})
+endforeach()
+
+foreach (script_source ${WEBSITESCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})

 endforeach()
 
 endforeach()
 

-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)

 
 set(WEBPATHS css images js)
 
 
 set(WEBPATHS css images js)