File FindQalculate.patch of Package cantor4

Overview Repositories Revisions Requests Users Attributes Meta

File FindQalculate.patch of Package cantor4 (Revision 27cd75cc910c0eb81db80605c826b011)

Currently displaying revision 27cd75cc910c0eb81db80605c826b011 , Show latest

From 28571472dcaf820441dbc7a1c195c7c1c0fd93e0 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: 123398
---
 cmake/FindQalculate.cmake | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

From d1da7168d624debb46547ff8b28fc5bb97bea920 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Tue, 29 Aug 2017 20:35:25 +0200
Subject: Don't search for and link to libcln when using libqalculate>=2.0

Cantor 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/D7589
---
 cmake/FindQalculate.cmake | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmake/FindQalculate.cmake b/cmake/FindQalculate.cmake
index 53bd302..b8e74f4 100644
--- a/cmake/FindQalculate.cmake
+++ b/cmake/FindQalculate.cmake
@@ -22,20 +22,43 @@ 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_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

Places

File FindQalculate.patch of Package cantor4 (Revision 27cd75cc910c0eb81db80605c826b011)

Places