fmt: update to 5.3.0.
This commit is contained in:
parent
9312d7469e
commit
c361ed67b4
2 changed files with 3 additions and 71 deletions
|
@ -1,68 +0,0 @@
|
||||||
From 57ae5189351665715c98b3b6ca8595b30d83033f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Cole Mickens <cole.mickens@gmail.com>
|
|
||||||
Date: Wed, 24 Oct 2018 01:33:22 -0700
|
|
||||||
Subject: [PATCH] cmake: output share/fmt.pc
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 9 +++++++++
|
|
||||||
support/cmake/fmt.pc.in | 11 +++++++++++
|
|
||||||
3 files changed, 20 insertions(+)
|
|
||||||
create mode 100644 support/cmake/fmt.pc.in
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 7cf74829..d1bc9558 100644
|
|
||||||
--- CMakeLists.txt
|
|
||||||
+++ CMakeLists.txt
|
|
||||||
@@ -202,6 +202,7 @@ if (FMT_INSTALL)
|
|
||||||
"Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
|
|
||||||
set(version_config ${PROJECT_BINARY_DIR}/fmt-config-version.cmake)
|
|
||||||
set(project_config ${PROJECT_BINARY_DIR}/fmt-config.cmake)
|
|
||||||
+ set(pkgconfig ${PROJECT_BINARY_DIR}/fmt.pc)
|
|
||||||
set(targets_export_name fmt-targets)
|
|
||||||
|
|
||||||
set (INSTALL_TARGETS fmt)
|
|
||||||
@@ -215,11 +216,18 @@ if (FMT_INSTALL)
|
|
||||||
set(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/fmt CACHE STRING
|
|
||||||
"Installation directory for include files, relative to ${CMAKE_INSTALL_PREFIX}.")
|
|
||||||
|
|
||||||
+ set(FMT_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH
|
|
||||||
+ "Installation directory for pkgconfig (.pc) files, relative to ${CMAKE_INSTALL_PREFIX}.")
|
|
||||||
+
|
|
||||||
# Generate the version, config and target files into the build directory.
|
|
||||||
write_basic_package_version_file(
|
|
||||||
${version_config}
|
|
||||||
VERSION ${FMT_VERSION}
|
|
||||||
COMPATIBILITY AnyNewerVersion)
|
|
||||||
+ configure_file(
|
|
||||||
+ "${PROJECT_SOURCE_DIR}/support/cmake/fmt.pc.in"
|
|
||||||
+ "${pkgconfig}"
|
|
||||||
+ @ONLY)
|
|
||||||
configure_package_config_file(
|
|
||||||
${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in
|
|
||||||
${project_config}
|
|
||||||
@@ -240,6 +248,7 @@ if (FMT_INSTALL)
|
|
||||||
install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
|
|
||||||
DESTINATION ${FMT_LIB_DIR})
|
|
||||||
install(FILES ${FMT_HEADERS} DESTINATION ${FMT_INC_DIR})
|
|
||||||
+ install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (FMT_DOC)
|
|
||||||
diff --git a/support/cmake/fmt.pc.in b/support/cmake/fmt.pc.in
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..4b82ddb0
|
|
||||||
--- /dev/null
|
|
||||||
+++ support/cmake/fmt.pc.in
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
+exec_prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
+libdir=@CMAKE_INSTALL_LIBDIR@
|
|
||||||
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
|
|
||||||
+
|
|
||||||
+Name: fmt
|
|
||||||
+Description: A modern formatting library
|
|
||||||
+Version: @FMT_VERSION@
|
|
||||||
+Libs: -L${libdir} -lfmt
|
|
||||||
+Cflags: -I${includedir}
|
|
||||||
+
|
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
# Template file for 'fmt'
|
# Template file for 'fmt'
|
||||||
pkgname=fmt
|
pkgname=fmt
|
||||||
version=5.2.1
|
version=5.3.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DBUILD_SHARED_LIBS=ON"
|
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
|
||||||
short_desc="Modern formatting library"
|
short_desc="Modern formatting library"
|
||||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||||
license="BSD-2-Clause"
|
license="BSD-2-Clause"
|
||||||
homepage="https://github.com/fmtlib/fmt"
|
homepage="https://github.com/fmtlib/fmt"
|
||||||
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
|
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
|
||||||
checksum=3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b
|
checksum=defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENSE.rst
|
vlicense LICENSE.rst
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue