From 9c7012bb39ee16c2fb491799de30d6d4bcab5969 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 19 Dec 2022 00:14:42 +0200 Subject: [PATCH] Revert "fix: simplified pkgconfig generation" This reverts commit c7393f75c369b178f5aaab8cee45870866a6a379. --- CMakeLists.txt | 14 ++++++++++++++ cglm.pc.in | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bf4d18..774bd2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,6 +157,20 @@ install(EXPORT ${PROJECT_NAME} NAMESPACE ${PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) +set(PACKAGE_NAME ${PROJECT_NAME}) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") + set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") +else() + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +endif() +if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") + set(libdir "${CMAKE_INSTALL_LIBDIR}") +else() + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +endif() +set(PACKAGE_VERSION "${PROJECT_VERSION}") configure_file(cglm.pc.in cglm.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cglm.pc diff --git a/cglm.pc.in b/cglm.pc.in index 139767f..b80b401 100644 --- a/cglm.pc.in +++ b/cglm.pc.in @@ -1,11 +1,11 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix="${prefix}" -libdir="${exec_prefix}/lib" -includedir="${prefix}/include" +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ -Name: @PROJECT_NAME@ -Description: @CMAKE_PROJECT_DESCRIPTION@ -URL: @CMAKE_PROJECT_HOMEPAGE_URL@ -Version: @PROJECT_VERSION@ +Name: @PACKAGE_NAME@ +Description: OpenGL Mathematics (glm) for C +URL: https://github.com/recp/cglm +Version: @PACKAGE_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} -lcglm @LIBS@