[C++] Correctly join paths for pkg-config file

stephanlachnit · stephanlachnit · commit ba81e1b9a847 · 2025-09-04T10:11:05.000+02:00
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
@@ -309,6 +309,8 @@ install(FILES
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Avro
 )
 
+cmake_path(APPEND pc_install_includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+cmake_path(APPEND pc_install_libdir "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/avro-cpp.pc.in"
     "${CMAKE_CURRENT_BINARY_DIR}/avro-cpp.pc"
diff --git a/lang/c++/cmake/avro-cpp.pc.in b/lang/c++/cmake/avro-cpp.pc.in
@@ -1,6 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+exec_prefix=${prefix}
+includedir=@pc_install_includedir@
+libdir=@pc_install_libdir@
 
 Name: avro-cpp
 Description: C++ library for parsing Avro data

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,8 @@ install(FILES`
`309`	`309`	`DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Avro`
`310`	`310`	`)`
`311`	`311`
	`312`	`+cmake_path(APPEND pc_install_includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")`
	`313`	`+cmake_path(APPEND pc_install_libdir "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")`
`312`	`314`	`configure_file(`
`313`	`315`	`"${CMAKE_CURRENT_SOURCE_DIR}/cmake/avro-cpp.pc.in"`
`314`	`316`	`"${CMAKE_CURRENT_BINARY_DIR}/avro-cpp.pc"`