From c82b5f29f1c4794e6519e9556fd7389a6628b63b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Dec 2021 15:09:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20PkgConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- MyxCMake/modules/MyxCMakePkgConfig.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd784aa..c079e70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(myx-cmake VERSION 0.4.2 LANGUAGES) +project(myx-cmake VERSION 0.4.4 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/MyxCMake/modules/MyxCMakePkgConfig.cmake b/MyxCMake/modules/MyxCMakePkgConfig.cmake index 08d8597..80351b7 100644 --- a/MyxCMake/modules/MyxCMakePkgConfig.cmake +++ b/MyxCMake/modules/MyxCMakePkgConfig.cmake @@ -16,27 +16,27 @@ function(myx_cmake_generate_pkgconfig target) get_target_property(__target_type ${target} TYPE) if(__target_type STREQUAL INTERFACE_LIBRARY) file( - WRITE "${CMAKE_BINARY_DIR}/${BASENAME}.pc" + WRITE "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc" "prefix=${CMAKE_INSTALL_PREFIX}\n" "exec_prefix=${CMAKE_INSTALL_PREFIX}\n" "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n" "\n" - "Name: ${BASENAME}\n" - "Description: ${BASENAME} header-only library\n" + "Name: ${ARG_BASENAME}\n" + "Description: ${ARG_BASENAME} header-only library\n" "Version: ${PROJECT_VERSION}\n" "\n" "Requires:\n" "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n") else() file( - WRITE "${CMAKE_BINARY_DIR}/${BASENAME}.pc" + WRITE "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc" "prefix=${CMAKE_INSTALL_PREFIX}\n" "exec_prefix=${CMAKE_INSTALL_PREFIX}\n" "libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\n" "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n" "\n" - "Name: ${BASENAME}\n" - "Description: ${BASENAME} library\n" + "Name: ${ARG_BASENAME}\n" + "Description: ${ARG_BASENAME} library\n" "Version: ${PROJECT_VERSION}\n" "\n" "Requires:\n" @@ -44,7 +44,7 @@ function(myx_cmake_generate_pkgconfig target) "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n") endif() install( - FILES "${CMAKE_BINARY_DIR}/${BASENAME}.pc" + FILES "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc" COMPONENT ${ARG_COMPONENT} DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endfunction()