From: Eldar Yusupov Date: Tue, 22 Oct 2019 18:15:38 +0000 (+0300) Subject: Move nominatim lib deps to its dir X-Git-Tag: v3.5.0~27^2~2^2~4 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/4aca3700b24e42d741514b3da7417c5f89119b33 Move nominatim lib deps to its dir --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 163b0494..1ad7ea2a 100644 --- 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 d862b2b3..d8daa4b8 100644 --- 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=$ PRIVATE HAVE_SYS_ENDIAN=$