From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 26 Jan 2020 01:27:08 -0800 Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config --- CMakeLists.txt | 15 +++++++++++++++ date.pc.in | 10 ++++++++++ 2 files changed, 25 insertions(+) create mode 100644 date.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index f30c473..fe778e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,15 @@ if( BUILD_TZ_LIB ) endif( ) endif( ) +if ( BUILD_TZ_LIB ) + # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ + set( TZ_COMPILE_DEFINITIONS "$,-D$, -D>,>" ) + configure_file(date.pc.in date.pc.cf @ONLY) + file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc" + INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" ) + +endif( ) + #[===================================================================[ installation #]===================================================================] @@ -171,6 +180,12 @@ install ( FILES cmake/dateConfig.cmake "${version_config}" DESTINATION ${CONFIG_LOC}) +if ( BUILD_TZ_LIB ) + install( + FILES ${CMAKE_BINARY_DIR}/date.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +endif( ) + #[===================================================================[ testing #]===================================================================] diff --git a/date.pc.in b/date.pc.in new file mode 100644 index 0000000..b9c4623 --- /dev/null +++ b/date.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_BINDIR@ +libdir=@CMAKE_INSTALL_LIB@ +includedir=@CMAKE_INSTALL_INCLUDE@ + +Name: date +Description: A date and time library based on the C++11/14/17 header +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -ltz +Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ it' value='search'/>
AgeCommit message (Expand)Author
2018-07-13guix package: Use relative symlinks to generations....Reported by Roel Janssen <roel@gnu.org> at <https://lists.gnu.org/archive/html/guix-devel/2018-07/msg00036.html>. * guix/profiles.scm (switch-to-generation): Use (basename generation) as the symlink target. * guix/scripts/package.scm (build-and-use-profile): Likewise, use (basename name) as the symlink target. * tests/guix-package.sh: Adjust --roll-back test accordingly. Add explicitly test with '-p foo/prof'. Ludovic Courtès
2018-06-06tests: Adjust 'guix package' test to "python2" name....This is a followup to a7714d42de2c3082f3609d1e63c83d703fb39cf9, which renamed Python 2.x to "python2". * tests/guix-package.sh: Use g-wrap and guile@2.0 when testing collisions. Ludovic Courtès
2018-03-31guix package: Add '--allow-collisions'....Fixes <https://bugs.gnu.org/30830>. Suggested by Ricardo Wurmus <rekado@elephly.net>. * guix/scripts/package.scm (build-and-use-profile): Add #:allow-collisions? and pass it to 'profile-derivation'. (show-help, %options): Add '--allow-collisions'. (manifest-action, process-actions): Pass #:allow-collisions? to 'build-and-use-profile'. * tests/guix-package.sh: Add collision test. * doc/guix.texi (Invoking guix package): Document '--allow-collisions'. Ludovic Courtès
2018-02-27guix package: '--search' no longer shows superseded packages....Fixes <https://bugs.gnu.org/30566>. Reported by Björn Höfling <bjoern.hoefling@bjoernhoefling.de>. * guix/scripts/package.scm (find-packages-by-description): Ignore superseded packages. * tests/guix-package.sh: Add test. Ludovic Courtès
2017-11-11tests: Adjust to new unbound-variable error message....This is a followup to dc856223f5eab57d8a4881782ec0f50abd12afa3. * tests/guix-package.sh: Adjust unbound-variable message regexp. Ludovic Courtès
2017-06-26guix package: 'guix package -r PKG -u' does not upgrade PKG....Fixes <http://bugs.gnu.org/27262>. Reported by Mark H Weaver <mhw@netris.org>. * guix/scripts/package.scm (transaction-upgrade-entry): Check if ENTRY matches 'manifest-transaction-removal-candidate?' and return TRANSACTION if it does. (process-actions): Move 'options->removable' from step 2 to step 1. Ludovic Courtès
2017-01-11guix package: Fix version and output for 'guix package -i /gnu/store/…'....* guix/utils.scm (package-name->name+version): Add optional 'delimiter' parameter. * guix/scripts/package.scm (store-item->manifest-entry): Pass #\- as the delimiter for 'package-name->name+version'. Use "out" instead of #f for the 'output' field. * tests/guix-package.sh: Add test. Ludovic Courtès