Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: rewrite Qalculate module

Browse source 
neither the Plasma runner nor the applet actually used the QALCULATE_CFLAGS
variable meaning that if Qalculate was installed in non-standard prefix
the build was likely to fail, this fixes that problem by replacing it with
QALCULATE_INCLUDE_DIR which will be used in the build system for the applet
and runner.

also fixes a CMake deprecation warning about using obsolete UsePkgConfig
module.

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-19 16:48:14 +00:00
parent 45eb9a8097
commit 21697dadf6
1 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
cmake/modules/FindQalculate.cmake
View file

@ -1,51 +1,47 @@
# - Try to find libqalculate
# Input variables
#
# QALCULATE_MIN_VERSION - minimal version of libqalculate
# QALCULATE_FIND_REQUIRED - fail if can't find libqalculate
# - Try to find Qalculate
#
# Once done this will define
#
# QALCULATE_FOUND - system has libqalculate
# QALCULATE_CFLAGS - libqalculate cflags
# QALCULATE_LIBRARIES - libqalculate libraries
# QALCULATE_FOUND - system has Qalculate
# QALCULATE_INCLUDE_DIR - Qalculate include directory
# QALCULATE_LIBRARIES - Qalculate libraries
#
# Copyright (c) 2007, Vladimir Kuznetsov, <ks.vladimir@gmail.com>
# Copyright (c) 2020, Ivailo Monev, <xakepa10@gmail.com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
if(QALCULATE_INCLUDE_DIR AND QALCULATE_LIBRARIES)
set(QALCULATE_FIND_QUIETLY TRUE)
endif()
# in cache already
set(QALCULATE_FOUND TRUE)
else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
if(NOT WIN32)
include(UsePkgConfig)
include(FindPkgConfig)
pkg_check_modules(PC_QALCULATE QUIET libqalculate)
if(QALCULATE_MIN_VERSION)
exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --atleast-version=${QALCULATE_MIN_VERSION} RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
else(QALCULATE_MIN_VERSION)
exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
endif(QALCULATE_MIN_VERSION)
set(QALCULATE_INCLUDE_DIR ${PC_QALCULATE_INCLUDE_DIRS})
set(QALCULATE_LIBRARIES ${PC_QALCULATE_LIBRARIES})
endif()
if(_return_VALUE STREQUAL "0")
exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --libs OUTPUT_VARIABLE QALCULATE_LIBRARIES)
exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --cflags OUTPUT_VARIABLE QALCULATE_CFLAGS)
set(QALCULATE_FOUND TRUE)
endif(_return_VALUE STREQUAL "0")
set(QALCULATE_VERSION ${PC_QALCULATE_VERSION})
else(NOT WIN32)
# XXX: currently no libqalculate on windows
set(QALCULATE_FOUND FALSE)
if(NOT QALCULATE_INCLUDE_DIR OR NOT QALCULATE_LIBRARIES)
find_path(QALCULATE_INCLUDE_DIR
NAMES qalculate.h
PATH_SUFFIXES libqalculate
HINTS $ENV{QALCULATEDIR}/include
)
endif(NOT WIN32)
find_library(QALCULATE_LIBRARIES
NAMES qalculate
HINTS $ENV{QALCULATEDIR}/lib
)
endif()
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qalculate DEFAULT_MSG QALCULATE_LIBRARIES )
mark_as_advanced(QALCULATE_CFLAGS QALCULATE_LIBRARIES)
endif(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
find_package_handle_standard_args(Qalculate
VERSION_VAR QALCULATE_VERSION
REQUIRED_VARS QALCULATE_LIBRARIES QALCULATE_INCLUDE_DIR
)
mark_as_advanced(QALCULATE_INCLUDE_DIR QALCULATE_LIBRARIES)