Merge branch 'separate-compilation' of https://github.com/eyusupov/Nominatim into...

diff --cc CMakeLists.txt
index ba234d55af4b3f558059f3b1321ceed6f2f01be1,66886f63ef735a09ffed7213a0d1002e99a624cb..31a572d67bf83df36eb97147d37e7b85c21140ef
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -35,24 -35,22 +35,24 @@@ add_definitions(-DNOMINATIM_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")
- 
- if (NOT ONLY_DOCS)
-     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?\
-         \nTry updating submodules with: git submodule update --init")
+ set(BUILD_DOCS on CACHE BOOL "Build documentation")
+ set(BUILD_SERVER on CACHE BOOL "Build API server")
+ set(BUILD_MODULE on CACHE BOOL "Build PostgreSQL module")
+ set(BUILD_NOMINATIM on CACHE BOOL "Build Nominatim executable")
+ set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql")
+ 
+ if (BUILD_SERVER)
+     if (BUILD_OSM2PGSQL)
+        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?\
+            \nTry updating submodules with: git submodule update --init")
+        endif()
+        add_subdirectory(osm2pgsql)
      endif()
-     add_subdirectory(osm2pgsql)
- 
-     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_package(PythonInterp 3)
 +
      find_program(PYOSMIUM pyosmium-get-changes)
      if (NOT EXISTS "${PYOSMIUM}")
          set(PYOSMIUM_PATH "")