From 099a08fc7687bdf79b01235f5953ec7b0e289ec9 Mon Sep 17 00:00:00 2001 From: fhgffy <102001626+fhgffy@users.noreply.github.com> Date: Mon, 5 Oct 2026 23:01:44 +0800 Subject: [PATCH] Preserve absolute install directories in pkg-config metadata --- .github/workflows/test.yml | 10 ++++++++++ CMakeLists.txt | 21 +++++++++++++++++++++ cmake/tinyxml2.pc.in | 4 ++-- test/pkgconfig.cmake | 19 +++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 test/pkgconfig.cmake diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8de362a..53f43417 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,6 +74,16 @@ jobs: run: ctest --output-on-failure working-directory: build-shared-rel + # Absolute installation directories in pkg-config metadata + - name: "Test pkg-config: Configure absolute paths" + run: >- + cmake -G Ninja -S . -B build-pkgconfig-absolute + "-DCMAKE_INSTALL_LIBDIR=${{runner.temp}}/tinyxml2-install-absolute/lib" + "-DCMAKE_INSTALL_INCLUDEDIR=${{runner.temp}}/tinyxml2-install-absolute/include" + - name: "Test pkg-config: Absolute paths" + run: ctest -R pkgconfig --output-on-failure + working-directory: build-pkgconfig-absolute + # Joint install - name: Install run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index b7bdf86a..f8e8fb9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,16 @@ install( ## pkg-config if (tinyxml2_INSTALL_PKGCONFIG) + if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") + set(tinyxml2_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}") + else () + set(tinyxml2_PC_LIBDIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + endif () + if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") + set(tinyxml2_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") + else () + set(tinyxml2_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif () configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY) file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen") install( @@ -132,3 +142,14 @@ if (tinyxml2_INSTALL_PKGCONFIG) COMPONENT tinyxml2_development ) endif () + +if (tinyxml2_BUILD_TESTING AND tinyxml2_INSTALL_PKGCONFIG) + add_test( + NAME pkgconfig + COMMAND "${CMAKE_COMMAND}" + "-DPKGCONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc" + "-DINSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}" + "-DINSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}" + -P "${CMAKE_CURRENT_SOURCE_DIR}/test/pkgconfig.cmake" + ) +endif () diff --git a/cmake/tinyxml2.pc.in b/cmake/tinyxml2.pc.in index a4fe22fa..91942079 100644 --- a/cmake/tinyxml2.pc.in +++ b/cmake/tinyxml2.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@tinyxml2_PC_LIBDIR@ +includedir=@tinyxml2_PC_INCLUDEDIR@ Name: TinyXML2 Description: simple, small, C++ XML parser diff --git a/test/pkgconfig.cmake b/test/pkgconfig.cmake new file mode 100644 index 00000000..e0a7821d --- /dev/null +++ b/test/pkgconfig.cmake @@ -0,0 +1,19 @@ +if (IS_ABSOLUTE "${INSTALL_LIBDIR}") + set(expected_libdir "${INSTALL_LIBDIR}") +else () + set(expected_libdir "\${exec_prefix}/${INSTALL_LIBDIR}") +endif () +if (IS_ABSOLUTE "${INSTALL_INCLUDEDIR}") + set(expected_includedir "${INSTALL_INCLUDEDIR}") +else () + set(expected_includedir "\${prefix}/${INSTALL_INCLUDEDIR}") +endif () + +file(STRINGS "${PKGCONFIG_FILE}" actual_libdir REGEX "^libdir=") +file(STRINGS "${PKGCONFIG_FILE}" actual_includedir REGEX "^includedir=") +if (NOT actual_libdir STREQUAL "libdir=${expected_libdir}") + message(FATAL_ERROR "Unexpected libdir: ${actual_libdir}") +endif () +if (NOT actual_includedir STREQUAL "includedir=${expected_includedir}") + message(FATAL_ERROR "Unexpected includedir: ${actual_includedir}") +endif ()