Skip to content
Snippets Groups Projects
Commit 5b9d3de1 authored by Guilherme Amadio's avatar Guilherme Amadio
Browse files

Do not require Libxml2 and OpenSSL when looking for Davix

When Davix is not builtin to ROOT, it's not necessary to propagate
link dependencies on Libxml2 and OpenSSL.
parent 939194d9
Branches
Tags
No related merge requests found
...@@ -36,31 +36,24 @@ ...@@ -36,31 +36,24 @@
# ``DAVIX_INCLUDE_DIR`` # ``DAVIX_INCLUDE_DIR``
# where to find the DAVIX headers (same as DAVIX_INCLUDE_DIRS) # where to find the DAVIX headers (same as DAVIX_INCLUDE_DIRS)
# #
# Since Davix depends on OpenSSL and LibXml2, none of the above will be defined
# unless both packages can be found.
foreach(var FOUND INCLUDE_DIR INCLUDE_DIRS LIBRARY LIBRARIES) foreach(var FOUND INCLUDE_DIR INCLUDE_DIRS LIBRARY LIBRARIES)
unset(DAVIX_${var} CACHE) unset(DAVIX_${var} CACHE)
endforeach() endforeach()
find_package(LibXml2 QUIET) find_package(PkgConfig)
find_package(OpenSSL QUIET)
if(LIBXML2_FOUND AND OPENSSL_FOUND) if(PKG_CONFIG_FOUND)
find_package(PkgConfig) if(${Davix_FIND_REQUIRED})
set(Davix_REQUIRED REQUIRED)
if(PKG_CONFIG_FOUND) endif()
if(${Davix_FIND_REQUIRED})
set(Davix_REQUIRED REQUIRED)
endif()
pkg_check_modules(DAVIX ${Davix_REQUIRED} davix>=${Davix_FIND_VERSION}) pkg_check_modules(DAVIX ${Davix_REQUIRED} davix>=${Davix_FIND_VERSION})
set(DAVIX_LIBRARIES ${DAVIX_LDFLAGS} ${LIBXML2_LIBRARIES} ${OPENSSL_LIBRARIES}) set(DAVIX_LIBRARIES ${DAVIX_LDFLAGS})
set(DAVIX_LIBRARY ${DAVIX_LIBRARIES}) set(DAVIX_LIBRARY ${DAVIX_LIBRARIES})
set(DAVIX_INCLUDE_DIRS ${DAVIX_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS}) set(DAVIX_INCLUDE_DIRS ${DAVIX_INCLUDE_DIRS})
set(DAVIX_INCLUDE_DIR ${DAVIX_INCLUDE_DIRS}) set(DAVIX_INCLUDE_DIR ${DAVIX_INCLUDE_DIRS})
endif()
endif() endif()
if(DAVIX_FOUND AND NOT TARGET Davix::Davix) if(DAVIX_FOUND AND NOT TARGET Davix::Davix)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment