summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <aleixpol@kde.org>2016-10-29 16:15:00 (GMT)
committerAleix Pol <aleixpol@kde.org>2016-10-29 16:17:41 (GMT)
commit505ef44479a5cbafc418f58ed2b98345a70701b4 (patch)
treecd2d6d8c2e221d2d9253c0ff55103531989abd08
parent58b2f0e1f06c28377b506f564185431444e114a4 (diff)
Fix LibSpectre look-up
-rw-r--r--cmake/modules/FindLibSpectre.cmake9
-rw-r--r--generators/CMakeLists.txt2
2 files changed, 1 insertions, 10 deletions
diff --git a/cmake/modules/FindLibSpectre.cmake b/cmake/modules/FindLibSpectre.cmake
index e770519..0387b49 100644
--- a/cmake/modules/FindLibSpectre.cmake
+++ b/cmake/modules/FindLibSpectre.cmake
@@ -12,13 +12,6 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
-
- # in cache already
- set(LIBSPECTRE_INTERNAL_FOUND TRUE)
-
-else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
-
if(NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
@@ -55,5 +48,3 @@ find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBS
# ensure that they are cached
set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} CACHE INTERNAL "The libspectre include path")
set(LIBSPECTRE_LIBRARY ${LIBSPECTRE_LIBRARY} CACHE INTERNAL "The libspectre library")
-
-endif(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 3e48b20..3a3144e 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -14,7 +14,7 @@ set_package_properties("Poppler" PROPERTIES
set(LIBSPECTRE_MINIMUM_VERSION "0.2")
find_package(LibSpectre "${LIBSPECTRE_MINIMUM_VERSION}")
-set_package_properties("libspectre" PROPERTIES
+set_package_properties(LibSpectre PROPERTIES
DESCRIPTION "A PostScript rendering library"
URL "http://libspectre.freedesktop.org/wiki/"
TYPE RECOMMENDED