From 7455a9eaed155e145b3a08e23e60093f934e8589 Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Thu, 31 Dec 2020 16:39:29 +0100 Subject: [PATCH] Add variables for configured options to CMake config files --- libxslt-config.cmake.cmake.in | 7 +++++-- libxslt-config.cmake.in | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libxslt-config.cmake.cmake.in b/libxslt-config.cmake.cmake.in index 0577fc41..65003707 100644 --- a/libxslt-config.cmake.cmake.in +++ b/libxslt-config.cmake.cmake.in @@ -75,12 +75,15 @@ set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_EXSLT_LIBRARY}) include(CMakeFindDependencyMacro) +set(LIBXSLT_SHARED @BUILD_SHARED_LIBS@) +set(LIBXSLT_WITH_CRYPTO @LIBXSLT_WITH_CRYPTO@) + find_dependency(LibXml2 CONFIG) list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS}) list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES}) -if(NOT @BUILD_SHARED_LIBS@) - if(@LIBXSLT_WITH_CRYPTO@) +if(NOT LIBXSLT_SHARED) + if(LIBXSLT_WITH_CRYPTO) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) find_dependency(Gcrypt) list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES}) diff --git a/libxslt-config.cmake.in b/libxslt-config.cmake.in index c99228f4..44deee1b 100644 --- a/libxslt-config.cmake.in +++ b/libxslt-config.cmake.in @@ -65,12 +65,14 @@ unset(LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES) include(CMakeFindDependencyMacro) +set(LIBXSLT_WITH_CRYPTO @WITH_CRYPTO@) + find_dependency(LibXml2 CONFIG) list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS}) list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES}) list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "LibXml2::LibXml2") -if(@WITH_CRYPTO@) +if(LIBXSLT_WITH_CRYPTO) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) find_dependency(Gcrypt) list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES})