Move nominatim lib deps to its dir

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 163b04943c68f8b39cf368ae94647ec2f1de761c..1ad7ea2a0c4a4ce23496a49d3015bd7cd79896f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,13 +72,6 @@ if (NOT ONLY_DOCS)
         message(FATAL_ERROR "Postgresql server package not found.")
     endif()
 
-    find_package(ZLIB REQUIRED)
-
-    find_package(BZip2 REQUIRED)
-
-    find_package(LibXml2 REQUIRED)
-    include_directories(${LIBXML2_INCLUDE_DIR})
-
     # Setting PHP binary variable as to command line (prevailing) or auto detect
     if (NOT PHP_BIN)
          find_program (PHP_BIN php)

diff --git a/nominatim/CMakeLists.txt b/nominatim/CMakeLists.txt
index d862b2b3b35ff773057bb6c347e85234c7c17f12..d8daa4b8c0496b55497a3cc6a3a63fad7da4a2c9 100644 (file)
--- a/nominatim/CMakeLists.txt
+++ b/nominatim/CMakeLists.txt
@@ -4,6 +4,12 @@ include(CheckSymbolExists)
 CHECK_SYMBOL_EXISTS(bswap_32 "byteswap.h" HAVE_BYTESWAP)
 CHECK_SYMBOL_EXISTS(bswap32 "sys/endian.h" HAVE_SYS_ENDIAN)
 
+find_package(ZLIB REQUIRED)
+find_package(BZip2 REQUIRED)
+find_package(LibXml2 REQUIRED)
+
+include_directories(${LIBXML2_INCLUDE_DIR})
+
 target_compile_definitions(nominatim
     PRIVATE HAVE_BYTESWAP=$<BOOL:${HAVE_BYTESWAP}>
     PRIVATE HAVE_SYS_ENDIAN=$<BOOL:${HAVE_SYS_ENDIAN}>