aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2009-01-05 18:36:26 +0000
committerAlexander Neundorf <neundorf@kde.org>2009-01-05 18:36:26 +0000
commit34bf652b09c5a929bf0a43a744fdd51153906020 (patch)
tree10c42168a4d3c8a4e709d9636ef419a07bb896d2
parentaa3cec92d6671cc624ff0bc9ae01c326c1ca1eb9 (diff)
downloadextra-cmake-modules-34bf652b09c5a929bf0a43a744fdd51153906020.tar.gz
extra-cmake-modules-34bf652b09c5a929bf0a43a744fdd51153906020.tar.bz2
-disable FindPlasma.cmake: it was broken, undocumented and since plasma didn't keep compatibility the cmake support for plasma also doesn't have to
This file is not used by anything in trunk/KDE/ anymore. Alex svn path=/trunk/KDE/kdelibs/; revision=906186
-rw-r--r--modules/FindPlasma.cmake33
1 files changed, 18 insertions, 15 deletions
diff --git a/modules/FindPlasma.cmake b/modules/FindPlasma.cmake
index 9346067b..72d07c79 100644
--- a/modules/FindPlasma.cmake
+++ b/modules/FindPlasma.cmake
@@ -1,17 +1,20 @@
-# PLASMA_INCLUDE_DIR
-# PLASMA_LIBS
-# Copyright (C) 2007 Brad Hards <bradh@frogmouth.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set(PLASMA_LIBS ${KDE4_PLASMA_LIBS} )
-set(PLASMA_INCLUDE_DIR ${KDE4_INCLUDE_DIR})
-set(PLASMA_FOUND true)
-
-find_file(PLASMA_OPENGL_FOUND plasma/glapplet.h
- PATHS ${PLASMA_INCLUDE_DIR}
- NO_DEFAULT_PATH)
+# FindPlasma.cmake was part of KDE 4.1, but Plasma itself didn't guarantee compatibility before 4.2,
+# so anything which relied on Plasma < 4.2 is broken anyway with KDE 4.2.
+# So since the package itself didn't keep compatibility, it doesn't make sense to provide
+# this file just to keep compatibility for the cmake part, this doesn't help anybody.
+# Especially now that plasma is part of kdelibs and as such the variables required
+# for using plasma are set by FindKDE4Internal.cmake.
+# This file is not used anywhere in trunk/KDE/ anymore, 3rd party projects get a
+# error message which tells them what to do, so we should be fine.
+# Alex
+#
-mark_as_advanced(PLASMA_INCLUDE_DIR PLASMA_LIBS)
+message(FATAL_ERROR "FindPlasma.cmake is deprecated. Now with KDE 4.2 Plasma is part of kdelibs and automatically found using find_package(KDE4) instead.
+Replace the variables previously coming from FindPlasma.cmake as follows:
+PLASMA_OPENGL_FOUND -> KDE4_PLASMA_OPENGL_FOUND
+PLASMA_LIBS -> KDE4_PLASMA_LIBS
+PLASMA_INCLUDE_DIR -> KDE4_INCLUDE_DIR or KDE4_INCLUDES, should be already set anyway
+PLASMA_FOUND -> nothing, it's always there if KDE4, version 4.2 or newer has been found.
+If you see this error message in a module within KDE/, update it from svn, it has been fixed already.
+")