adapt cmake to new directory structure

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65c5c0739ebd5f760de293ae5daa3d5532412b61..1fa4d1b47eaed223e5123b2000b1de17dd2cee0b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
 #  python (imports/updates only)
 #-----------------------------------------------------------------------------
 
 #  python (imports/updates only)
 #-----------------------------------------------------------------------------
 

-if (BUILD_IMPORTER)
+if (BUILD_IMPORTER OR BUILD_API)

     find_package(PythonInterp 3.7 REQUIRED)
 endif()
 
     find_package(PythonInterp 3.7 REQUIRED)
 endif()
 


@@ -221,11 +221,13 @@ if (BUILD_IMPORTER)
             DESTINATION ${CMAKE_INSTALL_BINDIR}
             RENAME nominatim)
 
             DESTINATION ${CMAKE_INSTALL_BINDIR}
             RENAME nominatim)
 

-    install(DIRECTORY nominatim
-            DESTINATION ${NOMINATIM_LIBDIR}/lib-python
-            FILES_MATCHING PATTERN "*.py"
-            PATTERN "paths.py" EXCLUDE
-            PATTERN __pycache__ EXCLUDE)
+    foreach (submodule nominatim_core nominatim_db nominatim_api)
+        install(DIRECTORY src/${submodule}
+                DESTINATION ${NOMINATIM_LIBDIR}/lib-python
+                FILES_MATCHING PATTERN "*.py"
+                PATTERN "paths.py" EXCLUDE
+                PATTERN __pycache__ EXCLUDE)
+    endforeach()

 
     if (EXISTS ${PHP_BIN})
         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py.tmpl paths-py.installed)
 
     if (EXISTS ${PHP_BIN})
         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py.tmpl paths-py.installed)


@@ -233,7 +235,7 @@ if (BUILD_IMPORTER)
         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py-no-php.tmpl paths-py.installed)
     endif()
     install(FILES ${PROJECT_BINARY_DIR}/paths-py.installed
         configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py-no-php.tmpl paths-py.installed)
     endif()
     install(FILES ${PROJECT_BINARY_DIR}/paths-py.installed

-            DESTINATION ${NOMINATIM_LIBDIR}/lib-python/nominatim
+            DESTINATION ${NOMINATIM_LIBDIR}/lib-python/nominatim_core

             RENAME paths.py)
 
     install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR})
             RENAME paths.py)
 
     install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR})

diff --git a/cmake/tool-installed.tmpl b/cmake/tool-installed.tmpl
index a6384f148ef2e5369692f4d9ec89a9de570ac98c..915f1d69cb49a3167e1b767a5d5f1bb20d398028 100644 (file)
--- a/cmake/tool-installed.tmpl
+++ b/cmake/tool-installed.tmpl
@@ -4,8 +4,8 @@ import os
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 

-from nominatim import cli
-from nominatim import version
+from nominatim_db import cli
+from nominatim_db import version

 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index fcdbe899295e4b207d72d68f779fdb2caa79e17a..4053ca35b8ec4745360df03e3d1dcaf46e3bafc2 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -2,10 +2,10 @@
 import sys
 import os
 
 import sys
 import os
 

-sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
+sys.path.insert(1, '@CMAKE_SOURCE_DIR@/src')

 
 

-from nominatim import cli
-from nominatim import version
+from nominatim_db import cli
+from nominatim_db import version

 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'