Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wkazubski:KDE4
kdebase4-workspace
FindQalculate.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File FindQalculate.patch of Package kdebase4-workspace
From 8b3f6ac7a959300803334f6959184a6df34360f0 Mon Sep 17 00:00:00 2001 From: Heiko Becker <heirecka@exherbo.org> Date: Fri, 17 Apr 2015 12:47:04 +0200 Subject: FindQalculate: Use FindPkgConfig instead of UsePkgConfig The latter is deprecated and doesn't respect the PKG_CONFIG environment variable which makes it easy to deal with differently named pkg-config executables, e.g. arch-prefixed ones. REVIEW: 123557 --- cmake/FindQalculate.cmake | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) From b915e5b4bab10af938441ac5cae8e62cf6bbb843 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <arojas@archlinux.org> Date: Tue, 29 Aug 2017 08:24:30 +0200 Subject: Don't search for and link to libcln when using libqalculate>=2.0 Plasma doesn't use any cln code directly, only via libqalculate. In version 2.0, libqalculate dropped cln in favor of gmp, so the cln dependency becomes unnecessary. Differential Revision: https://phabricator.kde.org/D7590 --- cmake/FindQalculate.cmake | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/cmake/modules/FindQalculate.cmake b/cmake/modules/FindQalculate.cmake index 53bd302..b8e74f4 100644 --- a/cmake/modules/FindQalculate.cmake +++ b/cmake/modules/FindQalculate.cmake @@ -22,20 +22,47 @@ if(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) if(NOT WIN32) - include(UsePkgConfig) + find_package(PkgConfig) if(QALCULATE_MIN_VERSION) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --atleast-version=${QALCULATE_MIN_VERSION} RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) + pkg_check_modules(_pc_QALCULATE libqalculate>=${QALCULATE_MIN_VERSION}) else(QALCULATE_MIN_VERSION) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) + pkg_check_modules(_pc_QALCULATE libqalculate) endif(QALCULATE_MIN_VERSION) - if(_return_VALUE STREQUAL "0") - exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --libs OUTPUT_VARIABLE QALCULATE_LIBRARIES) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS cln --libs OUTPUT_VARIABLE CLN_LIBRARIES) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --cflags OUTPUT_VARIABLE QALCULATE_CFLAGS) - set(QALCULATE_FOUND TRUE) - endif(_return_VALUE STREQUAL "0") + if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) + pkg_check_modules(_pc_CLN cln) + endif() + + if(_pc_QALCULATE_FOUND) + set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS}) + endif() + + find_library(QALCULATE_LIBRARIES + NAMES + qalculate + PATHS + ${_pc_QALCULATE_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ) + + find_path(QALCULATE_INCLUDE_DIR + NAMES + libqalculate + PATHS + ${_pc_QALCULATE_INCLUDE_DIRS} + ${INCLUDE_INSTALL_DIR} + ) + + if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) + find_library(CLN_LIBRARIES + NAMES + cln + PATHS + ${_pc_CLN_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ) + endif() else(NOT WIN32) # XXX: currently no libqalculate on windows -- cgit v0.11.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor