switch to symlink approach for packages

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bd99967351b7b0ea270bc204d953bb5d16f9f53..1fa4d1b47eaed223e5123b2000b1de17dd2cee0b 100644 (file)
--- 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 4)
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 4)

-set(NOMINATIM_VERSION_MINOR 3)
+set(NOMINATIM_VERSION_MINOR 4)

 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}")


@@ -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})