Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
21 changes: 21 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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 ()
4 changes: 2 additions & 2 deletions cmake/tinyxml2.pc.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 19 additions & 0 deletions test/pkgconfig.cmake
Original file line number Diff line number Diff line change
@@ -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 ()