Add options to compile only PG module/frontend

It makes it easier to install Nominatim server and PostgresSQL on
separate servers or use separate docker images for them.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ad7ea2a0c4a4ce23496a49d3015bd7cd79896f9..3c1668f408a7d9d5db3e84f27d6da94381b5e846 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,11 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
 set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
-set(ONLY_DOCS off CACHE BOOL "Build documentation only")
+set(BUILD_DOCS on CACHE BOOL "Build documentation")
+set(BUILD_SERVER on CACHE BOOL "Build API server")
+set(BUILD_MODULE on CACHE BOOL "Build module")
 
-if (NOT ONLY_DOCS)
+if (BUILD_SERVER)
     if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt")
         message(FATAL_ERROR "The osm2pgsql directory is empty.\
         Did you forget to check out Nominatim recursively?\
@@ -45,14 +47,6 @@ if (NOT ONLY_DOCS)
     endif()
     add_subdirectory(osm2pgsql)
 
-    find_package(Threads REQUIRED)
-
-    unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
-    set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
-    find_package(PostgreSQL REQUIRED)
-    include_directories(${PostgreSQL_INCLUDE_DIRS})
-    link_directories(${PostgreSQL_LIBRARY_DIRS})
-
     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")
         set(PYOSMIUM_PATH "")
@@ -63,15 +57,6 @@ if (NOT ONLY_DOCS)
     endif()
 
 
-    find_program(PG_CONFIG pg_config)
-    execute_process(COMMAND ${PG_CONFIG} --pgxs
-                    OUTPUT_VARIABLE PGXS
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (NOT EXISTS "${PGXS}")
-        message(FATAL_ERROR "Postgresql server package not found.")
-    endif()
-
     # Setting PHP binary variable as to command line (prevailing) or auto detect
     if (NOT PHP_BIN)
          find_program (PHP_BIN php)
@@ -89,49 +74,50 @@ endif()
 #
 #-----------------------------------------------------------------------------
 
-set(WEBSITESCRIPTS
-    website/deletable.php
-    website/details.php
-    website/hierarchy.php
-    website/lookup.php
-    website/polygons.php
-    website/reverse.php
-    website/search.php
-    website/status.php
-)
-
-set(CUSTOMSCRIPTS
-    utils/country_languages.php
-    utils/importWikipedia.php
-    utils/export.php
-    utils/query.php
-    utils/setup.php
-    utils/specialphrases.php
-    utils/update.php
-    utils/warm.php
+if (BUILD_SERVER)
+   set(WEBSITESCRIPTS
+       website/deletable.php
+       website/details.php
+       website/hierarchy.php
+       website/lookup.php
+       website/polygons.php
+       website/reverse.php
+       website/search.php
+       website/status.php
    )
 
-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()
-
-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
-               ${PROJECT_BINARY_DIR}/settings/settings.php)
-
-set(WEBPATHS css images js)
-
-foreach (wp ${WEBPATHS})
-    execute_process(
-        COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-    )
-endforeach()
-
+   set(CUSTOMSCRIPTS
+       utils/country_languages.php
+       utils/importWikipedia.php
+       utils/export.php
+       utils/query.php
+       utils/setup.php
+       utils/specialphrases.php
+       utils/update.php
+       utils/warm.php
+      )
+
+   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()
+
+   configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+                  ${PROJECT_BINARY_DIR}/settings/settings.php)
+
+   set(WEBPATHS css images js)
+
+   foreach (wp ${WEBPATHS})
+       execute_process(
+           COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
+       )
+   endforeach()
+endif()
 
 #-----------------------------------------------------------------------------
 #
@@ -139,7 +125,7 @@ endforeach()
 #
 #-----------------------------------------------------------------------------
 
-if (NOT ONLY_DOCS)
+if (BUILD_TESTS)
     include(CTest)
 
     set(TEST_BDD db osm2pgsql api)
@@ -159,10 +145,12 @@ endif()
 
 #-----------------------------------------------------------------------------
 
-if (NOT ONLY_DOCS)
+if (BUILD_MODULE)
     add_subdirectory(module)
     add_subdirectory(nominatim)
 endif()
-add_subdirectory(docs)
+if (BUILD_DOCS)
+   add_subdirectory(docs)
+endif()
 
 #-----------------------------------------------------------------------------

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 318e56501db660f1a1a4568772f89e93f58aa464..03beacb264a2bb5b6d6b0040335e8c7d15c317f2 100644 (file)
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,4 +1,13 @@
 # just use the pgxs makefile
+find_program(PG_CONFIG pg_config)
+execute_process(COMMAND ${PG_CONFIG} --pgxs
+            OUTPUT_VARIABLE PGXS
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if (NOT EXISTS "${PGXS}")
+message(FATAL_ERROR "Postgresql server package not found.")
+endif()
+
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
         COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} $(MAKE) -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
         COMMENT "Running external makefile ${PGXS}"

diff --git a/nominatim/CMakeLists.txt b/nominatim/CMakeLists.txt
index d6e7012724855a79317eb992edaf14f4da009b06..b2953044932581303a4ba1fc0244368dd4709bae 100644 (file)
--- a/nominatim/CMakeLists.txt
+++ b/nominatim/CMakeLists.txt
@@ -7,6 +7,7 @@ CHECK_SYMBOL_EXISTS(bswap32 "sys/endian.h" HAVE_SYS_ENDIAN)
 find_package(ZLIB REQUIRED)
 find_package(BZip2 REQUIRED)
 find_package(LibXml2 REQUIRED)
+find_package(Threads REQUIRED)
 
 unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
 set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
@@ -14,7 +15,6 @@ find_package(PostgreSQL REQUIRED)
 include_directories(${PostgreSQL_INCLUDE_DIRS})
 link_directories(${PostgreSQL_LIBRARY_DIRS})
 
-
 include_directories(${LIBXML2_INCLUDE_DIR})
 
 target_compile_definitions(nominatim