From 06e70292ff89d6799ca42d414c10208842521da8 Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Tue, 21 May 2024 15:02:10 -0400 Subject: [PATCH 1/2] use pkgconfig imported libxml target --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18a7a1ab5..eb41dd393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,10 +119,10 @@ IF(NOT CYCLUS_DOC_ONLY) # Find LibXML++ and dependencies pkg_check_modules(LIBXMLXX IMPORTED_TARGET libxml++-4.0) - IF ( NOT LIBXMLXX_LIBRARIES ) + IF ( NOT LIBXMLXX_FOUND ) pkg_check_modules(LIBXMLXX REQUIRED IMPORTED_TARGET libxml++-2.6) - ENDIF ( NOT LIBXMLXX_LIBRARIES ) - SET(LIBS ${LIBS} ${LIBXMLXX_LIBRARIES}) + ENDIF ( NOT LIBXMLXX_FOUND ) + SET(LIBS ${LIBS} PkgConfig::LIBXMLXX) message("-- LibXML++ Include Dir: ${LIBXMLXX_INCLUDE_DIRS}") message("-- LibXML++ Librarires: ${LIBXMLXX_LIBRARIES}") From 99798e82520dccc6143c252d61faabfe3103d7fc Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Tue, 21 May 2024 15:06:15 -0400 Subject: [PATCH 2/2] update CHANGELOG --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 989d8e73f..2daf88dc5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,7 @@ Since last release **Changed:** * Rely on ``python3`` in environment instead of ``python`` (#602) +* Link against ``libxml++`` imported target in CMake instead of ``LIBXMLXX_LIBRARIES`` (#608) **Fixed:**