From eba236c575c16657edb3cb1dd2fe9f9650cfad20 Mon Sep 17 00:00:00 2001 From: Simon Spannagel Date: Tue, 5 Nov 2024 22:44:21 +0100 Subject: [PATCH 1/4] Add pkgconfig file --- cmake/pkg-config.pc.in | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 cmake/pkg-config.pc.in diff --git a/cmake/pkg-config.pc.in b/cmake/pkg-config.pc.in new file mode 100644 index 000000000..21a195a5e --- /dev/null +++ b/cmake/pkg-config.pc.in @@ -0,0 +1,8 @@ +Name: ${PROJECT_NAME} +Description: ${PROJECT_DESCRIPTION} +Version: ${PROJECT_VERSION} +prefix=${CMAKE_INSTALL_PREFIX} +includedir=${PKG_CONFIG_INCLUDEDIR} +libdir=${PKG_CONFIG_LIBDIR} +Libs: ${PKG_CONFIG_LIBS} +Cflags: ${PKG_CONFIG_CFLAGS} \ No newline at end of file From a7c18b7dc4606eeacd5f8195633ef9c003d34d44 Mon Sep 17 00:00:00 2001 From: Simon Spannagel Date: Tue, 5 Nov 2024 22:46:09 +0100 Subject: [PATCH 2/4] Generate pgkconfig file --- CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6dd2bcd1..d1e4162e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,3 +266,26 @@ INSTALL ( DESTINATION "${cmake_config_path}" COMPONENT msgpack-cxx ) + +# pkgconfig file generation: + +SET(PKG_CONFIG_LIBDIR + "\${prefix}/${CMAKE_INSTALL_LIBDIR}" +) +SET(PKG_CONFIG_INCLUDEDIR + "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" +) +SET(PKG_CONFIG_LIBS + "-L\${libdir}" +) +SET(PKG_CONFIG_CFLAGS + "-I\${includedir}" +) + +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +) + +INSTALL(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) \ No newline at end of file From 26df1dc8b8931491aa77318c767ad49572e8ff82 Mon Sep 17 00:00:00 2001 From: simonspa <1677436+simonspa@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:16:22 +0100 Subject: [PATCH 3/4] Use prefix for pkgconfig Co-authored-by: Stephan Lachnit --- cmake/pkg-config.pc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/pkg-config.pc.in b/cmake/pkg-config.pc.in index 21a195a5e..18396252a 100644 --- a/cmake/pkg-config.pc.in +++ b/cmake/pkg-config.pc.in @@ -2,7 +2,7 @@ Name: ${PROJECT_NAME} Description: ${PROJECT_DESCRIPTION} Version: ${PROJECT_VERSION} prefix=${CMAKE_INSTALL_PREFIX} -includedir=${PKG_CONFIG_INCLUDEDIR} -libdir=${PKG_CONFIG_LIBDIR} +includedir=${prefix}/${CMAKE_INSTALL_INCLUDEDIR} +libdir=${prefix}/${CMAKE_INSTALL_LIBDIR} Libs: ${PKG_CONFIG_LIBS} Cflags: ${PKG_CONFIG_CFLAGS} \ No newline at end of file From 62ba2a8dd8254eee8915656cc57ec78640f96488 Mon Sep 17 00:00:00 2001 From: Simon Spannagel Date: Wed, 6 Nov 2024 10:18:18 +0100 Subject: [PATCH 4/4] Remove unecessary variables --- CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1e4162e9..080fe9d04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,14 +267,7 @@ INSTALL ( COMPONENT msgpack-cxx ) -# pkgconfig file generation: - -SET(PKG_CONFIG_LIBDIR - "\${prefix}/${CMAKE_INSTALL_LIBDIR}" -) -SET(PKG_CONFIG_INCLUDEDIR - "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" -) +# Generate the pkgconfig file: SET(PKG_CONFIG_LIBS "-L\${libdir}" ) @@ -288,4 +281,4 @@ CONFIGURE_FILE( ) INSTALL(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) \ No newline at end of file + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)