From ed6dc3a43f976099525c5dcde2bfe7dc4092fb3d Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 22 Apr 2022 05:51:10 +0800 Subject: [PATCH] [gsl] install pkgconfig file (#24285) --- ports/gsl/CMakeLists.txt | 3 +++ ports/gsl/portfile.cmake | 2 ++ ports/gsl/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/g-/gsl.json | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/gsl/CMakeLists.txt b/ports/gsl/CMakeLists.txt index 2d37f37e98..7e522cc5ce 100644 --- a/ports/gsl/CMakeLists.txt +++ b/ports/gsl/CMakeLists.txt @@ -75,6 +75,9 @@ if(INSTALL_HEADERS) set(TARGET_INSTALL_OPTIONS PUBLIC_HEADER DESTINATION include/gsl) endif() +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gsl.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(TARGETS gsl gslcblas RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index fb746d71f6..a107ce7b74 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -24,6 +24,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index c01838c613..44c14d97f4 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "gsl", "version": "2.7.1", + "port-version": 1, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", + "license": "GPL-3.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c7d1f10792..dddcaa8b7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "gsl": { "baseline": "2.7.1", - "port-version": 0 + "port-version": 1 }, "gsl-lite": { "baseline": "0.40.0", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index 635882c89c..c80bd88015 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d", + "version": "2.7.1", + "port-version": 1 + }, { "git-tree": "dc3b20f09d0d6131faaa2dc0448d60676af96672", "version": "2.7.1",