Commit d1da7168 authored by Antonio Rojas's avatar Antonio Rojas
Browse files

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
parent dd48437b
...@@ -30,9 +30,10 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) ...@@ -30,9 +30,10 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
pkg_check_modules(_pc_QALCULATE libqalculate) pkg_check_modules(_pc_QALCULATE libqalculate)
endif(QALCULATE_MIN_VERSION) endif(QALCULATE_MIN_VERSION)
pkg_check_modules(_pc_CLN cln)
if(_pc_QALCULATE_FOUND) if(_pc_QALCULATE_FOUND)
if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0)
pkg_check_modules(_pc_CLN cln)
endif()
set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS}) set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS})
endif(_pc_QALCULATE_FOUND) endif(_pc_QALCULATE_FOUND)
...@@ -52,6 +53,8 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) ...@@ -52,6 +53,8 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
${INCLUDE_INSTALL_DIR} ${INCLUDE_INSTALL_DIR}
) )
if(_pc_QALCULATE_FOUND)
if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0)
find_library(CLN_LIBRARIES find_library(CLN_LIBRARIES
NAMES NAMES
cln cln
...@@ -59,6 +62,8 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) ...@@ -59,6 +62,8 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
${_pc_CLN_LIBRARY_DIRS} ${_pc_CLN_LIBRARY_DIRS}
${LIB_INSTALL_DIR} ${LIB_INSTALL_DIR}
) )
endif()
endif()
else(NOT WIN32) else(NOT WIN32)
# XXX: currently no libqalculate on windows # XXX: currently no libqalculate on windows
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment