From 8e00cb36d5436c36413fad97c73bb3633ebc29f9 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Thu, 27 Nov 2014 12:44:05 +0100 Subject: [PATCH] cmake: Replace libstick by ${PACKAGE_STRING} --- include/CMakeLists.txt | 2 +- lib/CMakeLists.txt | 4 ++-- lib/{libstick.pc.cmake => pkgconfig.pc.cmake} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename lib/{libstick.pc.cmake => pkgconfig.pc.cmake} (100%) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index abe8362..da68f9b 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1 @@ -install (DIRECTORY ./ DESTINATION include/libstick-${PACKAGE_VERSION} FILES_MATCHING PATTERN "*.h") +install (DIRECTORY ./ DESTINATION include/${PACKAGE_STRING}-${PACKAGE_VERSION} FILES_MATCHING PATTERN "*.h") diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 788f09c..6432c9c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -5,5 +5,5 @@ #add_library(stick SHARED ${stick_SRC}) #install(TARGETS stick DESTINATION lib) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libstick.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libstick-${PACKAGE_VERSION}.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libstick-${PACKAGE_VERSION}.pc DESTINATION lib/pkgconfig COMPONENT "pkgconfig") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_STRING}-${PACKAGE_VERSION}.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_STRING}-${PACKAGE_VERSION}.pc DESTINATION lib/pkgconfig COMPONENT "pkgconfig") diff --git a/lib/libstick.pc.cmake b/lib/pkgconfig.pc.cmake similarity index 100% rename from lib/libstick.pc.cmake rename to lib/pkgconfig.pc.cmake -- 2.30.2