lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-05 23:35:48 +03:00
Code Activity

Update dependencies based on pkg-config definition

Browse Source
This commit is contained in:
Markus Rickert
2020-12-31 13:52:40 +01:00
committed by Nick Wellnhofer
parent 339aeab864
commit a1bae42b8a
3 changed files with 7 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -216,20 +216,12 @@ target_include_directories(
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
) )
if(LIBXSLT_WITH_CRYPTO)
target_link_libraries(LibXslt PRIVATE Gcrypt::Gcrypt)
endif()
target_link_libraries(LibXslt PUBLIC LibXml2::LibXml2) target_link_libraries(LibXslt PUBLIC LibXml2::LibXml2)
if(UNIX) if(UNIX)
target_link_libraries(LibXslt PRIVATE m) target_link_libraries(LibXslt PRIVATE m)
endif() endif()
if(LIBXSLT_WITH_THREADS)
target_link_libraries(LibXslt PRIVATE Threads::Threads)
endif()
set_target_properties( set_target_properties(
LibXslt LibXslt
PROPERTIES PROPERTIES
@@ -311,14 +303,6 @@ endif()
target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2) target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2)
if(UNIX)
target_link_libraries(LibExslt PRIVATE m)
endif()
if(LIBXSLT_WITH_THREADS)
target_link_libraries(LibExslt PRIVATE Threads::Threads)
endif()
set_target_properties( set_target_properties(
LibExslt LibExslt
PROPERTIES PROPERTIES

13
libxslt-config.cmake.cmake.in
View File

@@ -78,25 +78,18 @@ include(CMakeFindDependencyMacro)
find_dependency(LibXml2 CONFIG) find_dependency(LibXml2 CONFIG)
list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS}) list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS})
list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES}) list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES})
list(APPEND LIBXSLT_EXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${LIBXML2_LIBRARIES})
if(NOT @BUILD_SHARED_LIBS@) if(NOT @BUILD_SHARED_LIBS@)
if(@LIBXSLT_WITH_THREADS@)
find_dependency(Threads)
list(APPEND LIBXSLT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
endif()
if(@LIBXSLT_WITH_CRYPTO@) if(@LIBXSLT_WITH_CRYPTO@)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
find_dependency(Gcrypt) find_dependency(Gcrypt)
list(APPEND LIBXSLT_LIBRARIES ${GCRYPT_LIBRARIES})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES}) list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES})
endif() endif()
if(UNIX) if(UNIX)
list(APPEND LIBXSLT_LIBRARIES m) list(APPEND LIBXSLT_LIBRARIES m)
list(APPEND LIBXSLT_EXSLT_LIBRARIES m)
endif() endif()
endif() endif()
list(APPEND LIBXSLT_EXSLT_INCLUDE_DIRS ${LIBXSLT_INCLUDE_DIRS})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES})

19
libxslt-config.cmake.in
View File

@@ -69,23 +69,10 @@ find_dependency(LibXml2 CONFIG)
list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS}) list(APPEND LIBXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS})
list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES}) list(APPEND LIBXSLT_LIBRARIES ${LIBXML2_LIBRARIES})
list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "LibXml2::LibXml2") list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "LibXml2::LibXml2")
list(APPEND LIBXSLT_EXSLT_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${LIBXML2_LIBRARIES})
list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "LibXml2::LibXml2")
if(@WITH_THREADS@)
find_dependency(Threads)
list(APPEND LIBXSLT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Threads::Threads>")
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Threads::Threads>")
endif()
if(@WITH_CRYPTO@) if(@WITH_CRYPTO@)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
find_dependency(Gcrypt) find_dependency(Gcrypt)
list(APPEND LIBXSLT_LIBRARIES ${GCRYPT_LIBRARIES})
list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Gcrypt::Gcrypt>")
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES}) list(APPEND LIBXSLT_EXSLT_LIBRARIES ${GCRYPT_LIBRARIES})
list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Gcrypt::Gcrypt>") list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Gcrypt::Gcrypt>")
endif() endif()
@@ -93,10 +80,12 @@ endif()
if(UNIX) if(UNIX)
list(APPEND LIBXSLT_LIBRARIES m) list(APPEND LIBXSLT_LIBRARIES m)
list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>") list(APPEND LIBXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>")
list(APPEND LIBXSLT_EXSLT_LIBRARIES m)
list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>")
endif() endif()
list(APPEND LIBXSLT_EXSLT_INCLUDE_DIRS ${LIBXSLT_INCLUDE_DIRS})
list(APPEND LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES})
list(APPEND LIBXSLT_EXSLT_INTERFACE_LINK_LIBRARIES "LibXslt::LibXslt")
mark_as_advanced(LIBXSLT_LIBRARY LIBXSLT_EXSLT_LIBRARY LIBXSLT_XSLTPROC_EXECUTABLE) mark_as_advanced(LIBXSLT_LIBRARY LIBXSLT_EXSLT_LIBRARY LIBXSLT_XSLTPROC_EXECUTABLE)
if(NOT TARGET LibXslt::LibXslt AND DEFINED LIBXSLT_LIBRARY AND DEFINED LIBXSLT_INCLUDE_DIRS) if(NOT TARGET LibXslt::LibXslt AND DEFINED LIBXSLT_LIBRARY AND DEFINED LIBXSLT_INCLUDE_DIRS)